diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:31:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:31:38 -0500 |
| commit | bea15fd77ffa1338c293328b8c74a120be53e861 (patch) | |
| tree | be8ce29eee69f49fa56ee0e85d11866e07baab5e /arch/arm/mach-pxa/em-x270.c | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| parent | 72ee8499eb27f5724ac97b147350a5457a598aa3 (diff) | |
Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index d80c0ba9a095..c1b65da26335 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
| @@ -1301,6 +1301,7 @@ static void __init em_x270_init(void) | |||
| 1301 | MACHINE_START(EM_X270, "Compulab EM-X270") | 1301 | MACHINE_START(EM_X270, "Compulab EM-X270") |
| 1302 | .atag_offset = 0x100, | 1302 | .atag_offset = 0x100, |
| 1303 | .map_io = pxa27x_map_io, | 1303 | .map_io = pxa27x_map_io, |
| 1304 | .nr_irqs = PXA_NR_IRQS, | ||
| 1304 | .init_irq = pxa27x_init_irq, | 1305 | .init_irq = pxa27x_init_irq, |
| 1305 | .handle_irq = pxa27x_handle_irq, | 1306 | .handle_irq = pxa27x_handle_irq, |
| 1306 | .timer = &pxa_timer, | 1307 | .timer = &pxa_timer, |
| @@ -1311,6 +1312,7 @@ MACHINE_END | |||
| 1311 | MACHINE_START(EXEDA, "Compulab eXeda") | 1312 | MACHINE_START(EXEDA, "Compulab eXeda") |
| 1312 | .atag_offset = 0x100, | 1313 | .atag_offset = 0x100, |
| 1313 | .map_io = pxa27x_map_io, | 1314 | .map_io = pxa27x_map_io, |
| 1315 | .nr_irqs = PXA_NR_IRQS, | ||
| 1314 | .init_irq = pxa27x_init_irq, | 1316 | .init_irq = pxa27x_init_irq, |
| 1315 | .handle_irq = pxa27x_handle_irq, | 1317 | .handle_irq = pxa27x_handle_irq, |
| 1316 | .timer = &pxa_timer, | 1318 | .timer = &pxa_timer, |