From ab2567b4ac92f40a2651cb4ff78f42250120a673 Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Thu, 4 Jun 2009 10:44:53 +0300 Subject: [PATCH] --- yaml --- r: 149363 b: refs/heads/master c: 321d9eb32a903edc30a499262ad5b42cda98656c h: refs/heads/master i: 149361: 6d07b7795946cb8dc08ca2cef6ee338b1a82caea 149359: 03d37042099ca84c7dc62778a7a992af1d5f2ac8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/uncompress.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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; }