diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:42:23 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:42:23 +0100 |
commit | eed1e576507b52e03e549e0c9e0c747978122403 (patch) | |
tree | 69a7ecac041f83b0299f55a760f4f0cd5767ae05 /arch/arm/mach-ux500/include/mach | |
parent | 65af7c4608f7b7019e2faa220fb9624988965873 (diff) | |
parent | 76525ec214449318f793ff05fa5b0ecd0afe41cd (diff) | |
download | blackbird-op-linux-eed1e576507b52e03e549e0c9e0c747978122403.tar.gz blackbird-op-linux-eed1e576507b52e03e549e0c9e0c747978122403.zip |
Merge branch 'stericsson/cleanup' into next/timer
The timer and cleanup branches from stericsson conflict,
so I'm merging them here.
Conflicts:
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/cpu.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/include/mach')
-rw-r--r-- | arch/arm/mach-ux500/include/mach/uncompress.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h index 7dd08074c37b..6fb3c4b0105d 100644 --- a/arch/arm/mach-ux500/include/mach/uncompress.h +++ b/arch/arm/mach-ux500/include/mach/uncompress.h @@ -51,15 +51,9 @@ static void flush(void) static inline void arch_decomp_setup(void) { /* Check in run time if we run on an U8500 or U5500 */ - if (machine_is_u8500() || - machine_is_svp8500v1() || - machine_is_svp8500v2() || - machine_is_hrefv60() || - machine_is_snowball()) - ux500_uart_base = U8500_UART2_BASE; - else if (machine_is_u5500()) + if (machine_is_u5500()) ux500_uart_base = U5500_UART0_BASE; - else /* not much can be done to help here */ + else ux500_uart_base = U8500_UART2_BASE; } |