diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 06:00:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 06:00:16 -0400 |
| commit | 4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (patch) | |
| tree | b7f95922b2f1da5b36d95176e6d8f826151f3ee1 /arch/arm/mach-pxa/include/mach/uncompress.h | |
| parent | 98797a241e28b787b84d308b867ec4c5fe7bbdf8 (diff) | |
| parent | 7517b3fbe40c231d79d36f31c1e9930cbb8c4be2 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/uncompress.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/uncompress.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h index 5706cea95d11..b54749413e96 100644 --- 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) | |||
| 36 | static inline void arch_decomp_setup(void) | 36 | static inline void arch_decomp_setup(void) |
| 37 | { | 37 | { |
| 38 | if (machine_is_littleton() || machine_is_intelmote2() | 38 | if (machine_is_littleton() || machine_is_intelmote2() |
| 39 | || machine_is_csb726()) | 39 | || machine_is_csb726() || machine_is_stargate2() |
| 40 | || machine_is_cm_x300()) | ||
| 40 | UART = STUART; | 41 | UART = STUART; |
| 41 | } | 42 | } |
| 42 | 43 | ||