diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 03:28:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 03:29:05 -0400 |
| commit | 29e2035bddecce3eb584a8304528b50da8370a24 (patch) | |
| tree | 13155df7d90a8e287b83a1cd6c0d02c3018212ab /arch/arm/mach-omap2/board-zoom2.c | |
| parent | 868489660dabc0c28087cca3dbc1adbbc398c6fe (diff) | |
| parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
Merge branch 'linus' into core/rcu
Merge reason: Avoid fuzz in init/main.c and update from rc6 to rc8.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 | } |