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-rm680.c | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| parent | 3ef5d0071cf6c8b9a00b559232bb700ad59999d7 (diff) | |
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-rm680.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rm680.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index 45997bfbcbd..3c3a47317f8 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c @@ -25,7 +25,7 @@ #include <plat/i2c.h> #include <plat/mmc.h> #include <plat/usb.h> -#include <plat/gpmc.h> +#include "gpmc.h" #include "common.h" #include <plat/serial.h> @@ -33,6 +33,7 @@ #include "hsmmc.h" #include "sdram-nokia.h" #include "common-board-devices.h" +#include "gpmc-onenand.h" static struct regulator_consumer_supply rm680_vemmc_consumers[] = { REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"), |