diff options
| author | Linus Torvalds | 2010-03-20 02:16:20 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2010-03-20 02:16:20 +0100 |
| commit | e4d806377b069881f930089bf880918d3ad555ab (patch) | |
| tree | ed03416ddaa770bed16880ffea32b9b71dd5c7c7 /drivers/serial | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | serial: sh-sci: remove duplicated #include (diff) | |
| download | kernel-qcow2-linux-e4d806377b069881f930089bf880918d3ad555ab.tar.gz kernel-qcow2-linux-e4d806377b069881f930089bf880918d3ad555ab.tar.xz kernel-qcow2-linux-e4d806377b069881f930089bf880918d3ad555ab.zip | |
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 980f39449ee5..f7b9aff88f4a 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> |