Merge branch 'linus' into x86/urgent

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / include / mach / uncompress.h

diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h
index f4b029c039571c622a62d9e3a017480c89ce2fc2..5706cea95d1188e69a1788cb92c5422a7375badd 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/uncompress.h
+++ b/arch/arm/mach-pxa/include/mach/uncompress.h
@@ -35,7 +35,8 @@ static inline void flush(void)
 
 static inline void arch_decomp_setup(void)
 {
-       if (machine_is_littleton() || machine_is_intelmote2())
+       if (machine_is_littleton() || machine_is_intelmote2()
+                       || machine_is_csb726())
                UART = STUART;
 }