diff options
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index f736119f1ebf..38bcc2a0c515 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/mtd/sharpsl.h> | 27 | #include <linux/mtd/sharpsl.h> |
28 | #include <linux/input/matrix_keypad.h> | 28 | #include <linux/input/matrix_keypad.h> |
29 | #include <linux/regulator/machine.h> | 29 | #include <linux/regulator/machine.h> |
30 | #include <linux/io.h> | ||
30 | 31 | ||
31 | #include <asm/setup.h> | 32 | #include <asm/setup.h> |
32 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
@@ -980,7 +981,7 @@ static void __init spitz_fixup(struct machine_desc *desc, | |||
980 | #ifdef CONFIG_MACH_SPITZ | 981 | #ifdef CONFIG_MACH_SPITZ |
981 | MACHINE_START(SPITZ, "SHARP Spitz") | 982 | MACHINE_START(SPITZ, "SHARP Spitz") |
982 | .fixup = spitz_fixup, | 983 | .fixup = spitz_fixup, |
983 | .map_io = pxa_map_io, | 984 | .map_io = pxa27x_map_io, |
984 | .init_irq = pxa27x_init_irq, | 985 | .init_irq = pxa27x_init_irq, |
985 | .init_machine = spitz_init, | 986 | .init_machine = spitz_init, |
986 | .timer = &pxa_timer, | 987 | .timer = &pxa_timer, |
@@ -990,7 +991,7 @@ MACHINE_END | |||
990 | #ifdef CONFIG_MACH_BORZOI | 991 | #ifdef CONFIG_MACH_BORZOI |
991 | MACHINE_START(BORZOI, "SHARP Borzoi") | 992 | MACHINE_START(BORZOI, "SHARP Borzoi") |
992 | .fixup = spitz_fixup, | 993 | .fixup = spitz_fixup, |
993 | .map_io = pxa_map_io, | 994 | .map_io = pxa27x_map_io, |
994 | .init_irq = pxa27x_init_irq, | 995 | .init_irq = pxa27x_init_irq, |
995 | .init_machine = spitz_init, | 996 | .init_machine = spitz_init, |
996 | .timer = &pxa_timer, | 997 | .timer = &pxa_timer, |
@@ -1000,7 +1001,7 @@ MACHINE_END | |||
1000 | #ifdef CONFIG_MACH_AKITA | 1001 | #ifdef CONFIG_MACH_AKITA |
1001 | MACHINE_START(AKITA, "SHARP Akita") | 1002 | MACHINE_START(AKITA, "SHARP Akita") |
1002 | .fixup = spitz_fixup, | 1003 | .fixup = spitz_fixup, |
1003 | .map_io = pxa_map_io, | 1004 | .map_io = pxa27x_map_io, |
1004 | .init_irq = pxa27x_init_irq, | 1005 | .init_irq = pxa27x_init_irq, |
1005 | .init_machine = spitz_init, | 1006 | .init_machine = spitz_init, |
1006 | .timer = &pxa_timer, | 1007 | .timer = &pxa_timer, |