diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-10 14:24:18 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-10 14:24:18 +0100 |
| commit | f40aac940aa83645ec2218ccce90cc1c6881b74c (patch) | |
| tree | 6d775da1489722a684f85249fa57528851e11957 /arch/arm/mach-omap2/board-generic.c | |
| parent | Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 (diff) | |
| parent | OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB (diff) | |
| download | linux-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-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 3492162a65c3..fd00aa03690c 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -33,7 +33,7 @@ static void __init omap_generic_init_irq(void) { - omap2_init_common_hw(NULL); + omap2_init_common_hw(NULL, NULL); omap_init_irq(); } |