diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-01-08 14:43:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 09:34:10 -0800 |
| commit | 07c706a6226ea7556a41fced300248d1daac90db (patch) | |
| tree | a1a8607fcc960e1ec9af72e4e91850cea41a2898 /arch/mn10300/unit-asb2305 | |
| parent | e5d20d01023e76f3c1289cfca2e3305de7ff9e69 (diff) | |
| download | op-kernel-dev-07c706a6226ea7556a41fced300248d1daac90db.zip op-kernel-dev-07c706a6226ea7556a41fced300248d1daac90db.tar.gz | |
mn10300: fix several bogus includes on abs2305
asm/cpu never existed for mn10300; the files they are looking for are in
asm.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mn10300/unit-asb2305')
| -rw-r--r-- | arch/mn10300/unit-asb2305/include/unit/serial.h | 2 | ||||
| -rw-r--r-- | arch/mn10300/unit-asb2305/include/unit/timex.h | 2 | ||||
| -rw-r--r-- | arch/mn10300/unit-asb2305/leds.c | 4 | ||||
| -rw-r--r-- | arch/mn10300/unit-asb2305/unit-init.c | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/arch/mn10300/unit-asb2305/include/unit/serial.h b/arch/mn10300/unit-asb2305/include/unit/serial.h index 3bfc9093..8086cc0 100644 --- a/arch/mn10300/unit-asb2305/include/unit/serial.h +++ b/arch/mn10300/unit-asb2305/include/unit/serial.h @@ -11,7 +11,7 @@ #ifndef _ASM_UNIT_SERIAL_H #define _ASM_UNIT_SERIAL_H -#include <asm/cpu/cpu-regs.h> +#include <asm/cpu-regs.h> #include <proc/irq.h> #include <linux/serial_reg.h> diff --git a/arch/mn10300/unit-asb2305/include/unit/timex.h b/arch/mn10300/unit-asb2305/include/unit/timex.h index a71c49a..d1c72d5 100644 --- a/arch/mn10300/unit-asb2305/include/unit/timex.h +++ b/arch/mn10300/unit-asb2305/include/unit/timex.h @@ -15,7 +15,7 @@ #include <linux/irq.h> #endif /* __ASSEMBLY__ */ -#include <asm/cpu/timer-regs.h> +#include <asm/timer-regs.h> #include <unit/clock.h> /* diff --git a/arch/mn10300/unit-asb2305/leds.c b/arch/mn10300/unit-asb2305/leds.c index d345ff9..6f8de99 100644 --- a/arch/mn10300/unit-asb2305/leds.c +++ b/arch/mn10300/unit-asb2305/leds.c @@ -13,8 +13,8 @@ #include <linux/init.h> #include <asm/io.h> #include <asm/processor.h> -#include <asm/cpu/intctl-regs.h> -#include <asm/cpu/rtc-regs.h> +#include <asm/intctl-regs.h> +#include <asm/rtc-regs.h> #include <unit/leds.h> static const u8 asb2305_led_hex_tbl[16] = { diff --git a/arch/mn10300/unit-asb2305/unit-init.c b/arch/mn10300/unit-asb2305/unit-init.c index 1c452cc..a76c8e0 100644 --- a/arch/mn10300/unit-asb2305/unit-init.c +++ b/arch/mn10300/unit-asb2305/unit-init.c @@ -15,9 +15,8 @@ #include <asm/io.h> #include <asm/setup.h> #include <asm/processor.h> -#include <asm/cpu/intctl-regs.h> -#include <asm/cpu/rtc-regs.h> -#include <asm/cpu/serial-regs.h> +#include <asm/intctl-regs.h> +#include <asm/serial-regs.h> #include <unit/serial.h> /* |
