diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/mach-pxa/balloon3.c | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/arm/mach-pxa/balloon3.c')
| -rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index 810a982a66f8..ef3e8b1e06c1 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c | |||
| @@ -825,6 +825,7 @@ MACHINE_START(BALLOON3, "Balloon3") | |||
| 825 | .map_io = balloon3_map_io, | 825 | .map_io = balloon3_map_io, |
| 826 | .nr_irqs = BALLOON3_NR_IRQS, | 826 | .nr_irqs = BALLOON3_NR_IRQS, |
| 827 | .init_irq = balloon3_init_irq, | 827 | .init_irq = balloon3_init_irq, |
| 828 | .handle_irq = pxa27x_handle_irq, | ||
| 828 | .timer = &pxa_timer, | 829 | .timer = &pxa_timer, |
| 829 | .init_machine = balloon3_init, | 830 | .init_machine = balloon3_init, |
| 830 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 831 | .boot_params = PLAT_PHYS_OFFSET + 0x100, |