diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
| commit | 884897e6a10a86de0e611a76f4bf3fd0068a672c (patch) | |
| tree | 019689fb9d129404af1efba4df10975bc9e0a57a /arch/arm/mach-rpc/riscpc.c | |
| parent | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (diff) | |
| parent | 8b61f37440388ebbd2a894178fe098f2e70ab392 (diff) | |
Merge branch 'highbank/soc' into next/soc
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-mxc/include/mach/gpio.h
Diffstat (limited to 'arch/arm/mach-rpc/riscpc.c')
| -rw-r--r-- | arch/arm/mach-rpc/riscpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c index a9241eb87724..8559598ab767 100644 --- a/arch/arm/mach-rpc/riscpc.c +++ b/arch/arm/mach-rpc/riscpc.c | |||
| @@ -74,7 +74,7 @@ static struct map_desc rpc_io_desc[] __initdata = { | |||
| 74 | .length = IO_SIZE , | 74 | .length = IO_SIZE , |
| 75 | .type = MT_DEVICE | 75 | .type = MT_DEVICE |
| 76 | }, { /* EASI space */ | 76 | }, { /* EASI space */ |
| 77 | .virtual = EASI_BASE, | 77 | .virtual = (unsigned long)EASI_BASE, |
| 78 | .pfn = __phys_to_pfn(EASI_START), | 78 | .pfn = __phys_to_pfn(EASI_START), |
| 79 | .length = EASI_SIZE, | 79 | .length = EASI_SIZE, |
| 80 | .type = MT_DEVICE | 80 | .type = MT_DEVICE |