diff --git a/[refs] b/[refs] index 2046d2779323..7c3452e7a218 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1858ced3f990777defda93ad10ffa81c28ddc2e2 +refs/heads/master: 321d9eb32a903edc30a499262ad5b42cda98656c diff --git a/trunk/arch/arm/mach-pxa/include/mach/uncompress.h b/trunk/arch/arm/mach-pxa/include/mach/uncompress.h index c6cfd7cd4244..b54749413e96 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/uncompress.h +++ b/trunk/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_stargate2()) + || machine_is_csb726() || machine_is_stargate2() + || machine_is_cm_x300()) UART = STUART; }