diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-16 14:54:19 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-16 14:54:19 -0700 |
| commit | 94709014ea8d2f24fbc1e6eb6982e801e325bd47 (patch) | |
| tree | a99f2f7184d414d44fccb648a71565cab2c670b3 /arch/arm/mach-omap2/board-omap3pandora.c | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| parent | 3ef5d0071cf6c8b9a00b559232bb700ad59999d7 (diff) | |
| download | olio-linux-3.10-94709014ea8d2f24fbc1e6eb6982e801e325bd47.tar.xz olio-linux-3.10-94709014ea8d2f24fbc1e6eb6982e801e325bd47.zip | |
Merge tag 'gpmc-czimage' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/cleanup-headers-gpmc
gpmc cleanup for common ARM zImage
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 00a1f4ae6e4..f286b4b4bd5 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -50,6 +50,7 @@ #include "sdram-micron-mt46h32m32lf-6.h" #include "hsmmc.h" #include "common-board-devices.h" +#include "gpmc-nand.h" #define PANDORA_WIFI_IRQ_GPIO 21 #define PANDORA_WIFI_NRESET_GPIO 23 @@ -602,7 +603,7 @@ static void __init omap3pandora_init(void) omap_ads7846_init(1, OMAP3_PANDORA_TS_GPIO, 0, NULL); usbhs_init(&usbhs_bdata); usb_musb_init(NULL); - gpmc_nand_init(&pandora_nand_data); + gpmc_nand_init(&pandora_nand_data, NULL); /* Ensure SDRC pins are mux'd for self-refresh */ omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT); |