diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/plat-mxc/include/mach/board-mx27ads.h | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/board-mx27ads.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/board-mx27ads.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/plat-mxc/include/mach/board-mx27ads.h b/arch/arm/plat-mxc/include/mach/board-mx27ads.h index d42f4e6116f8..7776d230327f 100644 --- a/arch/arm/plat-mxc/include/mach/board-mx27ads.h +++ b/arch/arm/plat-mxc/include/mach/board-mx27ads.h | |||
| @@ -26,12 +26,6 @@ | |||
| 26 | MXC_MAX_VIRTUAL_INTS) | 26 | MXC_MAX_VIRTUAL_INTS) |
| 27 | 27 | ||
| 28 | /* | 28 | /* |
| 29 | * MXC UART EVB board level configurations | ||
| 30 | */ | ||
| 31 | #define MXC_LL_UART_PADDR UART1_BASE_ADDR | ||
| 32 | #define MXC_LL_UART_VADDR AIPI_IO_ADDRESS(UART1_BASE_ADDR) | ||
| 33 | |||
| 34 | /* | ||
| 35 | * @name Memory Size parameters | 29 | * @name Memory Size parameters |
| 36 | */ | 30 | */ |
| 37 | 31 | ||