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-footbridge | |
| 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-footbridge')
| -rw-r--r-- | arch/arm/mach-footbridge/include/mach/io.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/io.h b/arch/arm/mach-footbridge/include/mach/io.h index 32e4cc397c2..15a70396c27 100644 --- a/arch/arm/mach-footbridge/include/mach/io.h +++ b/arch/arm/mach-footbridge/include/mach/io.h | |||
| @@ -23,8 +23,6 @@ | |||
| 23 | #define PCIO_SIZE 0x00100000 | 23 | #define PCIO_SIZE 0x00100000 |
| 24 | #define PCIO_BASE MMU_IO(0xff000000, 0x7c000000) | 24 | #define PCIO_BASE MMU_IO(0xff000000, 0x7c000000) |
| 25 | 25 | ||
| 26 | #define IO_SPACE_LIMIT 0xffff | ||
| 27 | |||
| 28 | /* | 26 | /* |
| 29 | * Translation of various region addresses to virtual addresses | 27 | * Translation of various region addresses to virtual addresses |
| 30 | */ | 28 | */ |