diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 22:07:18 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 22:07:18 +0400 |
| commit | 99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (patch) | |
| tree | 23db2359ad86957359da7c8a458e25eddb08d776 /arch/arm/mach-omap2/board-cm-t3517.c | |
| parent | 94c657853bd228ebbc2c590b7f81efcc1dde3329 (diff) | |
| parent | 94709014ea8d2f24fbc1e6eb6982e801e325bd47 (diff) | |
| download | linux-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.tar.xz | |
Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/pm34xx.c
drivers/mtd/nand/omap2.c
drivers/mtd/onenand/omap2.c
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t3517.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-cm-t3517.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 59c0a45f75b0..b5495e415024 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c @@ -41,7 +41,7 @@ #include "common.h" #include <plat/usb.h> #include <linux/platform_data/mtd-nand-omap2.h> -#include <plat/gpmc.h> +#include "gpmc.h" #include "am35xx.h" @@ -49,6 +49,7 @@ #include "control.h" #include "common-board-devices.h" #include "am35xx-emac.h" +#include "gpmc-nand.h" #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) static struct gpio_led cm_t3517_leds[] = { @@ -240,7 +241,7 @@ static struct omap_nand_platform_data cm_t3517_nand_data = { static void __init cm_t3517_init_nand(void) { - if (gpmc_nand_init(&cm_t3517_nand_data) < 0) + if (gpmc_nand_init(&cm_t3517_nand_data, NULL) < 0) pr_err("CM-T3517: NAND initialization failed\n"); } #else |