Merge git://git.infradead.org/battery-2.6

[pandora-kernel.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 5706cea..b547494 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/uncompress.h
+++ b/arch/arm/mach-pxa/include/mach/uncompress.h
@@ -36,7 +36,8 @@ static inline void flush(void)
 static inline void arch_decomp_setup(void)
 {
        if (machine_is_littleton() || machine_is_intelmote2()
-                       || machine_is_csb726())
+           || machine_is_csb726() || machine_is_stargate2()
+           || machine_is_cm_x300())
                UART = STUART;
 }