git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
[safe/jmp/linux-2.6]
/
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
4182353
..
06dfba8
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();
+ omap2_init_common_hw(
NULL
);
omap_init_irq();
omap_gpio_init();
apollon_init_smc91x();