diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-01 12:34:21 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-01 12:34:21 +0000 |
| commit | 8d685b7f4d9c9882442bf1b492558d5f17b694fa (patch) | |
| tree | fcd2cfc985cad3982b5334f3b57054c7279770bc /arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | |
| parent | 1e81799bd62d42bb6d5ec5c74e9b022e7d44f11c (diff) | |
| parent | 2b222a2971e4d73fc25c09aeb203c16c0c3c142e (diff) | |
| download | linux-stable-8d685b7f4d9c9882442bf1b492558d5f17b694fa.tar.gz linux-stable-8d685b7f4d9c9882442bf1b492558d5f17b694fa.tar.bz2 linux-stable-8d685b7f4d9c9882442bf1b492558d5f17b694fa.zip | |
Merge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'msm/misc' into next/cleanup
Diffstat (limited to 'arch/arm/mach-msm/include/mach/msm_iomap-8x50.h')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h index d67cd73316f4..0faa894729b7 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h @@ -83,18 +83,6 @@ #define MSM_UART3_PHYS 0xA9C00000 #define MSM_UART3_SIZE SZ_4K -#ifdef CONFIG_MSM_DEBUG_UART -#define MSM_DEBUG_UART_BASE 0xE1000000 -#if CONFIG_MSM_DEBUG_UART == 1 -#define MSM_DEBUG_UART_PHYS MSM_UART1_PHYS -#elif CONFIG_MSM_DEBUG_UART == 2 -#define MSM_DEBUG_UART_PHYS MSM_UART2_PHYS -#elif CONFIG_MSM_DEBUG_UART == 3 -#define MSM_DEBUG_UART_PHYS MSM_UART3_PHYS -#endif -#define MSM_DEBUG_UART_SIZE SZ_4K -#endif - #define MSM_MDC_BASE IOMEM(0xE0200000) #define MSM_MDC_PHYS 0xAA500000 #define MSM_MDC_SIZE SZ_1M |