diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-01-03 17:50:40 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-01-25 21:37:48 -0500 |
commit | 8661fb92045c5710754d450ebb82461fcfa08b65 (patch) | |
tree | b687f8aa0b3a598a16b66433ece34122ce87a6b4 /arch/arm/mach-mmp/aspenite.c | |
parent | 0f55239348aa85021d8bf8b63d84a796fcc142a4 (diff) |
ARM: mmp: remove NR_IRQS
Remove NR_IRQS and add a per machine .nr_irqs setting. Clean-up namespace
replacing usage of IRQ_BOARD_START with MMP_NR_IRQS.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch/arm/mach-mmp/aspenite.c')
-rw-r--r-- | arch/arm/mach-mmp/aspenite.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c index 17cb76060125..5483d6f5c6d7 100644 --- a/arch/arm/mach-mmp/aspenite.c +++ b/arch/arm/mach-mmp/aspenite.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <mach/addr-map.h> | 24 | #include <mach/addr-map.h> |
25 | #include <mach/mfp-pxa168.h> | 25 | #include <mach/mfp-pxa168.h> |
26 | #include <mach/pxa168.h> | 26 | #include <mach/pxa168.h> |
27 | #include <mach/irqs.h> | ||
27 | #include <video/pxa168fb.h> | 28 | #include <video/pxa168fb.h> |
28 | #include <linux/input.h> | 29 | #include <linux/input.h> |
29 | #include <plat/pxa27x_keypad.h> | 30 | #include <plat/pxa27x_keypad.h> |
@@ -240,7 +241,7 @@ static void __init common_init(void) | |||
240 | 241 | ||
241 | MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform") | 242 | MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform") |
242 | .map_io = mmp_map_io, | 243 | .map_io = mmp_map_io, |
243 | .nr_irqs = IRQ_BOARD_START, | 244 | .nr_irqs = MMP_NR_IRQS, |
244 | .init_irq = pxa168_init_irq, | 245 | .init_irq = pxa168_init_irq, |
245 | .timer = &pxa168_timer, | 246 | .timer = &pxa168_timer, |
246 | .init_machine = common_init, | 247 | .init_machine = common_init, |
@@ -249,7 +250,7 @@ MACHINE_END | |||
249 | 250 | ||
250 | MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform") | 251 | MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform") |
251 | .map_io = mmp_map_io, | 252 | .map_io = mmp_map_io, |
252 | .nr_irqs = IRQ_BOARD_START, | 253 | .nr_irqs = MMP_NR_IRQS, |
253 | .init_irq = pxa168_init_irq, | 254 | .init_irq = pxa168_init_irq, |
254 | .timer = &pxa168_timer, | 255 | .timer = &pxa168_timer, |
255 | .init_machine = common_init, | 256 | .init_machine = common_init, |