diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:06:24 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 11:06:24 -0500 |
| commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
| tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /arch/arm/mach-omap1/board-ams-delta.c | |
| parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index e255164ff087..a8fce3ccc707 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
| @@ -625,7 +625,6 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") | |||
| 625 | .atag_offset = 0x100, | 625 | .atag_offset = 0x100, |
| 626 | .map_io = ams_delta_map_io, | 626 | .map_io = ams_delta_map_io, |
| 627 | .init_early = omap1_init_early, | 627 | .init_early = omap1_init_early, |
| 628 | .reserve = omap_reserve, | ||
| 629 | .init_irq = omap1_init_irq, | 628 | .init_irq = omap1_init_irq, |
| 630 | .init_machine = ams_delta_init, | 629 | .init_machine = ams_delta_init, |
| 631 | .init_late = ams_delta_init_late, | 630 | .init_late = ams_delta_init_late, |