diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 17:37:37 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 17:37:37 -0400 |
| commit | af15c1addf920d830b030e3489a482456904ca8c (patch) | |
| tree | dc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /arch/arm/mach-omap2/board-ldp.c | |
| parent | e6f25a7b2398581a5f96bf9021d0b22c9647acf4 (diff) | |
| parent | dcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 2 |
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) | |||
| 270 | 270 | ||
| 271 | static void __init omap_ldp_init_irq(void) | 271 | static void __init omap_ldp_init_irq(void) |
| 272 | { | 272 | { |
| 273 | omap2_init_common_hw(NULL); | 273 | omap2_init_common_hw(NULL, NULL); |
| 274 | omap_init_irq(); | 274 | omap_init_irq(); |
| 275 | omap_gpio_init(); | 275 | omap_gpio_init(); |
| 276 | ldp_init_smsc911x(); | 276 | ldp_init_smsc911x(); |