summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 18:16:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-19 18:16:20 -0700
commite4d806377b069881f930089bf880918d3ad555ab (patch)
treeed03416ddaa770bed16880ffea32b9b71dd5c7c7 /drivers/serial
parentb50df7d1fb37eb6aea87590b391d7111fde87121 (diff)
parent3f7581d66ece6b7ff643c8c817bfbd72cdbe9077 (diff)
downloadop-kernel-dev-e4d806377b069881f930089bf880918d3ad555ab.zip
op-kernel-dev-e4d806377b069881f930089bf880918d3ad555ab.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: serial: sh-sci: remove duplicated #include sh: Export uncached helper symbols. sh: Fix up NUMA build for 29-bit. serial: sh-sci: Fix build failure for non-sh architectures. sh: Fix up uncached offset for legacy 29-bit mode. sh: Support CPU affinity masks for INTC controllers.
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/sh-sci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 980f394..f7b9aff 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -50,7 +50,6 @@
#include <linux/list.h>
#include <linux/dmaengine.h>
#include <linux/scatterlist.h>
-#include <linux/timer.h>
#ifdef CONFIG_SUPERH
#include <asm/sh_bios.h>
OpenPOWER on IntegriCloud