aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-ldp.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-08-10 14:24:18 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-08-10 14:24:18 +0100
commitf40aac940aa83645ec2218ccce90cc1c6881b74c (patch)
tree6d775da1489722a684f85249fa57528851e11957 /arch/arm/mach-omap2/board-ldp.c
parentMerge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 (diff)
parentOMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB (diff)
downloadlinux-dev-f40aac940aa83645ec2218ccce90cc1c6881b74c.tar.xz
linux-dev-f40aac940aa83645ec2218ccce90cc1c6881b74c.zip
Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r--arch/arm/mach-omap2/board-ldp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index d8bc0a7dcb8d..ea383f88cb1b 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -270,7 +270,7 @@ static inline void __init ldp_init_smsc911x(void)
static void __init omap_ldp_init_irq(void)
{
- omap2_init_common_hw(NULL);
+ omap2_init_common_hw(NULL, NULL);
omap_init_irq();
omap_gpio_init();
ldp_init_smsc911x();