diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:09:41 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:09:41 +0100 |
| commit | b1f71bd0328a8c928258d3c8be689ddbc13a8a3b (patch) | |
| tree | ed0f0b21ed9ab96a1bfca107cbe37e0692d12d4e /arch/arm/mach-omap1/board-osk.c | |
| parent | 591d07bf13a009315340d4b65c7ffef6aaed6bca (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
| download | linux-b1f71bd0328a8c928258d3c8be689ddbc13a8a3b.tar.bz2 | |
Merge branch 'omap/headers4' into next/dt
These changes are needed for the following omap DT changes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 5973945a8741..872ea47cd28a 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -48,7 +48,7 @@ #include <mach/flash.h> #include <mach/mux.h> -#include <plat/tc.h> +#include <mach/tc.h> #include <mach/hardware.h> #include <mach/usb.h> @@ -606,7 +606,6 @@ MACHINE_START(OMAP_OSK, "TI-OSK") .atag_offset = 0x100, .map_io = omap16xx_map_io, .init_early = omap1_init_early, - .reserve = omap_reserve, .init_irq = omap1_init_irq, .init_machine = osk_init, .init_late = omap1_init_late, |