mach-ux500: remove most of the ugly machine_is_*() calls

[pandora-kernel.git] / arch / arm / mach-ux500 / include / mach / uncompress.h

diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h
index 7dd0807..6fb3c4b 100644 (file)
--- 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 */
 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;
                ux500_uart_base = U5500_UART0_BASE;

-       else /* not much can be done to help here */
+       else

                ux500_uart_base = U8500_UART2_BASE;
 }
 
                ux500_uart_base = U8500_UART2_BASE;
 }