diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-16 17:54:19 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-16 17:54:19 -0400 |
| commit | 94709014ea8d2f24fbc1e6eb6982e801e325bd47 (patch) | |
| tree | a99f2f7184d414d44fccb648a71565cab2c670b3 /arch/arm/mach-omap2/board-rx51-peripherals.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-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 020e03c95bfe..42b6056decae 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include "common.h" | 33 | #include "common.h" |
| 34 | #include <plat/dma.h> | 34 | #include <plat/dma.h> |
| 35 | #include <plat/gpmc.h> | 35 | #include "gpmc.h" |
| 36 | #include <plat/omap-pm.h> | 36 | #include <plat/omap-pm.h> |
| 37 | #include "gpmc-smc91x.h" | 37 | #include "gpmc-smc91x.h" |
| 38 | 38 | ||
| @@ -54,6 +54,7 @@ | |||
| 54 | #include "mux.h" | 54 | #include "mux.h" |
| 55 | #include "hsmmc.h" | 55 | #include "hsmmc.h" |
| 56 | #include "common-board-devices.h" | 56 | #include "common-board-devices.h" |
| 57 | #include "gpmc-onenand.h" | ||
| 57 | 58 | ||
| 58 | #define SYSTEM_REV_B_USES_VAUX3 0x1699 | 59 | #define SYSTEM_REV_B_USES_VAUX3 0x1699 |
| 59 | #define SYSTEM_REV_S_USES_VAUX3 0x8 | 60 | #define SYSTEM_REV_S_USES_VAUX3 0x8 |