diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 08:32:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 08:32:15 -0800 |
| commit | 83afdf2464ac17ad6321a68b2fe7528c9aa88016 (patch) | |
| tree | bb2c9b8c402d417c9da76fa222968225737f2f31 /arch/sh/kernel/cpu/sh3/setup-sh7710.c | |
| parent | 219ff3ad611ecfe8a2fd29b8c50a5313c9d15383 (diff) | |
| parent | b2d7c7f7a69fd953626c3e507bac70e18b21f70e (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:
arch/sh/drivers/dma/dma-sh.c: Correct use of ! and &
serial: Move asm-sh/sci.h to linux/serial_sci.h.
sh: Fix up HAS_SR_RB typo in entry-macros.
maple: fix device detection
sh: fix rtc_resources setup for sh770x
sh: heartbeat: ioremap is expected to succeed
sh: Storage class should be before const qualifier
maple: remove unused variable
sh: SH5-103 needs to select CPU_SH5.
sh: Rename SH-3 CCR3 reg to avoid synclink_cs clash.
Diffstat (limited to 'arch/sh/kernel/cpu/sh3/setup-sh7710.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh3/setup-sh7710.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c index 0cc0e2bf135..7406c9ad925 100644 --- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c +++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c @@ -12,7 +12,7 @@ #include <linux/init.h> #include <linux/irq.h> #include <linux/serial.h> -#include <asm/sci.h> +#include <linux/serial_sci.h> #include <asm/rtc.h> enum { |