git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/pcm-drain-nonblock' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-zoom2.c
diff --git
a/arch/arm/mach-omap2/board-zoom2.c
b/arch/arm/mach-omap2/board-zoom2.c
index
bcc0f76
..
427b7b8
100644
(file)
--- a/
arch/arm/mach-omap2/board-zoom2.c
+++ b/
arch/arm/mach-omap2/board-zoom2.c
@@
-25,7
+25,7
@@
static void __init omap_zoom2_init_irq(void)
{
static void __init omap_zoom2_init_irq(void)
{
- omap2_init_common_hw(NULL);
+ omap2_init_common_hw(NULL
, NULL
);
omap_init_irq();
omap_gpio_init();
}
omap_init_irq();
omap_gpio_init();
}