diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index ee8c3cfb95b3..1164b1061038 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
@@ -35,9 +35,8 @@ | |||
35 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
36 | 36 | ||
37 | #include "common.h" | 37 | #include "common.h" |
38 | #include <plat/gpmc.h> | 38 | #include "board-zoom.h" |
39 | #include <mach/board-zoom.h> | 39 | #include "gpmc.h" |
40 | #include <plat/usb.h> | ||
41 | #include "gpmc-smsc911x.h" | 40 | #include "gpmc-smsc911x.h" |
42 | 41 | ||
43 | #include <video/omapdss.h> | 42 | #include <video/omapdss.h> |
@@ -420,8 +419,8 @@ static void __init omap_ldp_init(void) | |||
420 | omap_serial_init(); | 419 | omap_serial_init(); |
421 | omap_sdrc_init(NULL, NULL); | 420 | omap_sdrc_init(NULL, NULL); |
422 | usb_musb_init(NULL); | 421 | usb_musb_init(NULL); |
423 | board_nand_init(ldp_nand_partitions, | 422 | board_nand_init(ldp_nand_partitions, ARRAY_SIZE(ldp_nand_partitions), |
424 | ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0); | 423 | ZOOM_NAND_CS, 0, nand_default_timings); |
425 | 424 | ||
426 | omap_hsmmc_init(mmc); | 425 | omap_hsmmc_init(mmc); |
427 | ldp_display_init(); | 426 | ldp_display_init(); |