diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 21:16:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 21:16:20 -0400 |
| commit | e4d806377b069881f930089bf880918d3ad555ab (patch) | |
| tree | ed03416ddaa770bed16880ffea32b9b71dd5c7c7 /drivers/serial | |
| parent | b50df7d1fb37eb6aea87590b391d7111fde87121 (diff) | |
| parent | 3f7581d66ece6b7ff643c8c817bfbd72cdbe9077 (diff) | |
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 @@ | |||
| 50 | #include <linux/list.h> | 50 | #include <linux/list.h> |
| 51 | #include <linux/dmaengine.h> | 51 | #include <linux/dmaengine.h> |
| 52 | #include <linux/scatterlist.h> | 52 | #include <linux/scatterlist.h> |
| 53 | #include <linux/timer.h> | ||
| 54 | 53 | ||
| 55 | #ifdef CONFIG_SUPERH | 54 | #ifdef CONFIG_SUPERH |
| 56 | #include <asm/sh_bios.h> | 55 | #include <asm/sh_bios.h> |