diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-10 09:24:18 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-10 09:24:18 -0400 |
| commit | f40aac940aa83645ec2218ccce90cc1c6881b74c (patch) | |
| tree | 6d775da1489722a684f85249fa57528851e11957 /arch/arm/mach-omap2/board-zoom2.c | |
| parent | 7063c88c726a704e648ba36ca78baa630f8b7b0a (diff) | |
| parent | 3c82e229f09a6acc8d24dc27c5e0e60b1d7161c2 (diff) | |
Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom2.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index bcc0f7632dea..427b7b8b1237 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | static void __init omap_zoom2_init_irq(void) | 26 | static void __init omap_zoom2_init_irq(void) |
| 27 | { | 27 | { |
| 28 | omap2_init_common_hw(NULL); | 28 | omap2_init_common_hw(NULL, NULL); |
| 29 | omap_init_irq(); | 29 | omap_init_irq(); |
| 30 | omap_gpio_init(); | 30 | omap_gpio_init(); |
| 31 | } | 31 | } |