diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-01-29 09:41:02 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 09:41:02 -0800 |
| commit | c1353ef200fcc222f3b76b78a44ebb8f16e75ea6 (patch) | |
| tree | 0d444b86893eff97327c3c83c8310b3bc15ebc5f /arch/arm/include | |
| parent | Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/cleanup (diff) | |
| parent | ARM: imx: Remove mx508 support (diff) | |
| download | linux-dev-c1353ef200fcc222f3b76b78a44ebb8f16e75ea6.tar.xz linux-dev-c1353ef200fcc222f3b76b78a44ebb8f16e75ea6.zip | |
Merge tag 'imx-cleanup-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup
From Shawn Guo:
IMX cleanup for 3.9:
* Remove lluart.c by using debug_ll_io_init()
* Remove mach-mx51_3ds board support
* Remove imx50 support which has been BROKEN for cycles
* Other trival cleanups
* tag 'imx-cleanup-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: Remove mx508 support
ARM: imx: Remove mach-mx51_3ds board
ARM: imx: use debug_ll_io_init() for imx6q
ARM: imx: remove unused imx6q_clock_map_io()
ARM: mach-imx: Kconfig: Do not select Babbage for MACH_IMX51_DT
Signed-off-by: Olof Johansson <olof@lixom.net>
Change/delete conflicts due to some of the previous sweeping cleanups in:
arch/arm/mach-imx/mach-mx50_rdp.c
arch/arm/mach-imx/mach-mx51_3ds.c
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/debug/imx.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/debug/imx.S b/arch/arm/include/debug/imx.S index 0c4e17d4d359..c6f294cf18f0 100644 --- a/arch/arm/include/debug/imx.S +++ b/arch/arm/include/debug/imx.S @@ -34,7 +34,7 @@ #define UART_PADDR 0x43f90000 #elif defined (CONFIG_DEBUG_IMX51_UART) #define UART_PADDR 0x73fbc000 -#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART) +#elif defined (CONFIG_DEBUG_IMX53_UART) #define UART_PADDR 0x53fbc000 #elif defined (CONFIG_DEBUG_IMX6Q_UART) #define UART_PADDR IMX6Q_DEBUG_UART_BASE |