diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:35:10 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:35:10 +0200 |
commit | c33d4326b60a3aea5cd070a365043f488f81a3b0 (patch) | |
tree | 22732738445e6293a15f5408945784d1c2fd7019 /arch/arm/mach-omap2/board-am3517crane.c | |
parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
parent | 1ad920556f32a5a127397ca461d1a1faaf22c4e0 (diff) |
Merge branch 'omap/board' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/board
Diffstat (limited to 'arch/arm/mach-omap2/board-am3517crane.c')
-rw-r--r-- | arch/arm/mach-omap2/board-am3517crane.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c index 5e438a77cd7..5f2b55ff04f 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c @@ -104,7 +104,7 @@ MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD") .reserve = omap_reserve, .map_io = omap3_map_io, .init_early = am3517_crane_init_early, - .init_irq = omap_init_irq, + .init_irq = omap3_init_irq, .init_machine = am3517_crane_init, - .timer = &omap_timer, + .timer = &omap3_timer, MACHINE_END |