diff options
Diffstat (limited to 'arch/arm/mach-sa1100/h3600.c')
-rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index b34ff42bbd75..af25a78d705d 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/serial_core.h> | 30 | #include <linux/serial_core.h> |
31 | 31 | ||
32 | #include <asm/irq.h> | 32 | #include <asm/irq.h> |
33 | #include <asm/hardware.h> | 33 | #include <mach/hardware.h> |
34 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
35 | #include <asm/setup.h> | 35 | #include <asm/setup.h> |
36 | 36 | ||
@@ -41,14 +41,14 @@ | |||
41 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
42 | #include <asm/mach/serial_sa1100.h> | 42 | #include <asm/mach/serial_sa1100.h> |
43 | 43 | ||
44 | #include <asm/arch/h3600.h> | 44 | #include <mach/h3600.h> |
45 | 45 | ||
46 | #if defined (CONFIG_SA1100_H3600) || defined (CONFIG_SA1100_H3100) | 46 | #if defined (CONFIG_SA1100_H3600) || defined (CONFIG_SA1100_H3100) |
47 | #include <asm/arch/h3600_gpio.h> | 47 | #include <mach/h3600_gpio.h> |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #ifdef CONFIG_SA1100_H3800 | 50 | #ifdef CONFIG_SA1100_H3800 |
51 | #include <asm/arch/h3600_asic.h> | 51 | #include <mach/h3600_asic.h> |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #include "generic.h" | 54 | #include "generic.h" |
@@ -681,7 +681,7 @@ static struct ipaq_model_ops h3800_model_ops __initdata = { | |||
681 | 681 | ||
682 | #define MAX_ASIC_ISR_LOOPS 20 | 682 | #define MAX_ASIC_ISR_LOOPS 20 |
683 | 683 | ||
684 | /* The order of these is important - see #include <asm/arch/irqs.h> */ | 684 | /* The order of these is important - see #include <mach/irqs.h> */ |
685 | static u32 kpio_irq_mask[] = { | 685 | static u32 kpio_irq_mask[] = { |
686 | KPIO_KEY_ALL, | 686 | KPIO_KEY_ALL, |
687 | KPIO_SPI_INT, | 687 | KPIO_SPI_INT, |