projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/oss' into for-linus
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap2
/
board-apollon.c
diff --git
a/arch/arm/mach-omap2/board-apollon.c
b/arch/arm/mach-omap2/board-apollon.c
index 06dfba888b0ca408b9691e1623774f366e1569d3..dcfc20d03894c65cba921266c753f29228add833 100644
(file)
--- a/
arch/arm/mach-omap2/board-apollon.c
+++ b/
arch/arm/mach-omap2/board-apollon.c
@@
-250,7
+250,7
@@
out:
static void __init omap_apollon_init_irq(void)
{
- omap2_init_common_hw(NULL);
+ omap2_init_common_hw(NULL
, NULL
);
omap_init_irq();
omap_gpio_init();
apollon_init_smc91x();