diff options
Diffstat (limited to 'arch/arm/mach-netx')
-rw-r--r-- | arch/arm/mach-netx/generic.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/nxdb500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/nxdkn.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/nxeb500hmi.c | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index aa627465d914..27c2cb7ab813 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c | |||
@@ -23,9 +23,9 @@ | |||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
26 | #include <linux/irqchip/arm-vic.h> | ||
26 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
27 | #include <asm/mach/map.h> | 28 | #include <asm/mach/map.h> |
28 | #include <asm/hardware/vic.h> | ||
29 | #include <mach/netx-regs.h> | 29 | #include <mach/netx-regs.h> |
30 | #include <asm/mach/irq.h> | 30 | #include <asm/mach/irq.h> |
31 | 31 | ||
diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c index 8b781ff7c9e9..04d5e5eb6473 100644 --- a/arch/arm/mach-netx/nxdb500.c +++ b/arch/arm/mach-netx/nxdb500.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | #include <asm/hardware/vic.h> | ||
32 | #include <mach/netx-regs.h> | 31 | #include <mach/netx-regs.h> |
33 | #include <linux/platform_data/eth-netx.h> | 32 | #include <linux/platform_data/eth-netx.h> |
34 | 33 | ||
@@ -204,7 +203,6 @@ MACHINE_START(NXDB500, "Hilscher nxdb500") | |||
204 | .atag_offset = 0x100, | 203 | .atag_offset = 0x100, |
205 | .map_io = netx_map_io, | 204 | .map_io = netx_map_io, |
206 | .init_irq = netx_init_irq, | 205 | .init_irq = netx_init_irq, |
207 | .handle_irq = vic_handle_irq, | ||
208 | .timer = &netx_timer, | 206 | .timer = &netx_timer, |
209 | .init_machine = nxdb500_init, | 207 | .init_machine = nxdb500_init, |
210 | .restart = netx_restart, | 208 | .restart = netx_restart, |
diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c index b26dbce334f2..cf15bdd50f6f 100644 --- a/arch/arm/mach-netx/nxdkn.c +++ b/arch/arm/mach-netx/nxdkn.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | #include <asm/hardware/vic.h> | ||
32 | #include <mach/netx-regs.h> | 31 | #include <mach/netx-regs.h> |
33 | #include <linux/platform_data/eth-netx.h> | 32 | #include <linux/platform_data/eth-netx.h> |
34 | 33 | ||
@@ -97,7 +96,6 @@ MACHINE_START(NXDKN, "Hilscher nxdkn") | |||
97 | .atag_offset = 0x100, | 96 | .atag_offset = 0x100, |
98 | .map_io = netx_map_io, | 97 | .map_io = netx_map_io, |
99 | .init_irq = netx_init_irq, | 98 | .init_irq = netx_init_irq, |
100 | .handle_irq = vic_handle_irq, | ||
101 | .timer = &netx_timer, | 99 | .timer = &netx_timer, |
102 | .init_machine = nxdkn_init, | 100 | .init_machine = nxdkn_init, |
103 | .restart = netx_restart, | 101 | .restart = netx_restart, |
diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c index 257382efafa0..069bd26e1b72 100644 --- a/arch/arm/mach-netx/nxeb500hmi.c +++ b/arch/arm/mach-netx/nxeb500hmi.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | #include <asm/hardware/vic.h> | ||
32 | #include <mach/netx-regs.h> | 31 | #include <mach/netx-regs.h> |
33 | #include <linux/platform_data/eth-netx.h> | 32 | #include <linux/platform_data/eth-netx.h> |
34 | 33 | ||
@@ -181,7 +180,6 @@ MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi") | |||
181 | .atag_offset = 0x100, | 180 | .atag_offset = 0x100, |
182 | .map_io = netx_map_io, | 181 | .map_io = netx_map_io, |
183 | .init_irq = netx_init_irq, | 182 | .init_irq = netx_init_irq, |
184 | .handle_irq = vic_handle_irq, | ||
185 | .timer = &netx_timer, | 183 | .timer = &netx_timer, |
186 | .init_machine = nxeb500hmi_init, | 184 | .init_machine = nxeb500hmi_init, |
187 | .restart = netx_restart, | 185 | .restart = netx_restart, |