diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t3517.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t3517.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 59c0a45f75b0..ebbc2adb499e 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
@@ -39,9 +39,8 @@ | |||
39 | #include <asm/mach/map.h> | 39 | #include <asm/mach/map.h> |
40 | 40 | ||
41 | #include "common.h" | 41 | #include "common.h" |
42 | #include <plat/usb.h> | ||
43 | #include <linux/platform_data/mtd-nand-omap2.h> | 42 | #include <linux/platform_data/mtd-nand-omap2.h> |
44 | #include <plat/gpmc.h> | 43 | #include "gpmc.h" |
45 | 44 | ||
46 | #include "am35xx.h" | 45 | #include "am35xx.h" |
47 | 46 | ||
@@ -49,6 +48,7 @@ | |||
49 | #include "control.h" | 48 | #include "control.h" |
50 | #include "common-board-devices.h" | 49 | #include "common-board-devices.h" |
51 | #include "am35xx-emac.h" | 50 | #include "am35xx-emac.h" |
51 | #include "gpmc-nand.h" | ||
52 | 52 | ||
53 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) | 53 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) |
54 | static struct gpio_led cm_t3517_leds[] = { | 54 | static struct gpio_led cm_t3517_leds[] = { |
@@ -240,7 +240,7 @@ static struct omap_nand_platform_data cm_t3517_nand_data = { | |||
240 | 240 | ||
241 | static void __init cm_t3517_init_nand(void) | 241 | static void __init cm_t3517_init_nand(void) |
242 | { | 242 | { |
243 | if (gpmc_nand_init(&cm_t3517_nand_data) < 0) | 243 | if (gpmc_nand_init(&cm_t3517_nand_data, NULL) < 0) |
244 | pr_err("CM-T3517: NAND initialization failed\n"); | 244 | pr_err("CM-T3517: NAND initialization failed\n"); |
245 | } | 245 | } |
246 | #else | 246 | #else |
@@ -297,6 +297,6 @@ MACHINE_START(CM_T3517, "Compulab CM-T3517") | |||
297 | .handle_irq = omap3_intc_handle_irq, | 297 | .handle_irq = omap3_intc_handle_irq, |
298 | .init_machine = cm_t3517_init, | 298 | .init_machine = cm_t3517_init, |
299 | .init_late = am35xx_init_late, | 299 | .init_late = am35xx_init_late, |
300 | .timer = &omap3_timer, | 300 | .timer = &omap3_gp_timer, |
301 | .restart = omap_prcm_restart, | 301 | .restart = omap3xxx_restart, |
302 | MACHINE_END | 302 | MACHINE_END |