aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-ap4evb.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-22 18:02:16 -0400
committerArnd Bergmann <arnd@arndb.de>2012-03-24 15:13:31 -0400
commit426f1af947c61dee48a9267f84bff227e503a547 (patch)
treeadbd2ad224278c58ac483af0b0d77f2c59e54315 /arch/arm/mach-shmobile/board-ap4evb.c
parent5cd9eb2736a572a9ef2689829f47ffd4262adc00 (diff)
parente9dd7ed2a365b021cdbb35b5cad62f6ab6aeb5d2 (diff)
Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc
Conflicts: arch/arm/mach-shmobile/board-ap4evb.c This moves the addition of init_consistent_dma_size() from the board files into the common sh7372_map_io() functions where all the other contents of the board specific map_io calls have gone. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ap4evb.c')
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 4739f039650a..c92c00527123 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -1188,6 +1188,7 @@ static struct i2c_board_info i2c1_devices[] = {
1188 }, 1188 },
1189}; 1189};
1190 1190
1191
1191#define GPIO_PORT9CR 0xE6051009 1192#define GPIO_PORT9CR 0xE6051009
1192#define GPIO_PORT10CR 0xE605100A 1193#define GPIO_PORT10CR 0xE605100A
1193#define USCCR1 0xE6058144 1194#define USCCR1 0xE6058144