summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-2430sdp.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-08-18 23:37:37 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2009-08-18 23:37:37 +0200
commitaf15c1addf920d830b030e3489a482456904ca8c (patch)
treedc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /arch/arm/mach-omap2/board-2430sdp.c
parentMerge branch 'master' into for-linus (diff)
parentMerge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
downloadlinux-af15c1addf920d830b030e3489a482456904ca8c.tar.xz
linux-af15c1addf920d830b030e3489a482456904ca8c.zip
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-2430sdp.c')
-rw-r--r--arch/arm/mach-omap2/board-2430sdp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 9c3fdcdf76c3..8ec2a132904d 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -141,7 +141,7 @@ static inline void board_smc91x_init(void)
static void __init omap_2430sdp_init_irq(void)
{
- omap2_init_common_hw(NULL);
+ omap2_init_common_hw(NULL, NULL);
omap_init_irq();
omap_gpio_init();
}