Merge tag 'renesas-boards-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-at91 / include / mach / uncompress.h

diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h
index acb2d890ad7e1ec58d79caaa1db576a8681a947f..4ebb609369e36895e0da7e68021eb6cbc962532e 100644 (file)
--- a/arch/arm/mach-at91/include/mach/uncompress.h
+++ b/arch/arm/mach-at91/include/mach/uncompress.h
@@ -31,7 +31,6 @@
 
 void __iomem *at91_uart;
 
-#if !defined(CONFIG_ARCH_AT91X40)
 static const u32 uarts_rm9200[] = {
        AT91_BASE_DBGU0,
        AT91RM9200_BASE_US0,
@@ -188,12 +187,6 @@ static inline void arch_decomp_setup(void)
 
        at91_uart = NULL;
 }
-#else
-static inline void arch_decomp_setup(void)
-{
-       at91_uart = NULL;
-}
-#endif
 
 /*
  * The following code assumes the serial port has already been