diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-07 19:07:10 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-07 19:07:10 +0000 |
commit | 1f63b9546a8c7b90de2d9e52cf8ff07f9f653d94 (patch) | |
tree | 6bd4915b4289ef32c94ecd523f38bb13ca032e4a /arch/arm/plat-mxc/include/mach/uncompress.h | |
parent | 4a683a2c5e7cabe91218db28e56dc25e1b134ce3 (diff) | |
parent | d8cff1365ec568149d57aeed8279d745591d0fa1 (diff) | |
download | op-kernel-dev-1f63b9546a8c7b90de2d9e52cf8ff07f9f653d94.zip op-kernel-dev-1f63b9546a8c7b90de2d9e52cf8ff07f9f653d94.tar.gz |
Merge branch 'fixes'
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/uncompress.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/uncompress.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h index 3a70ebf..ff469c4 100644 --- a/arch/arm/plat-mxc/include/mach/uncompress.h +++ b/arch/arm/plat-mxc/include/mach/uncompress.h @@ -95,6 +95,7 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) case MACH_TYPE_MX35_3DS: case MACH_TYPE_PCM043: case MACH_TYPE_LILLY1131: + case MACH_TYPE_VPR200: uart_base = MX3X_UART1_BASE_ADDR; break; case MACH_TYPE_MAGX_ZN5: @@ -102,6 +103,7 @@ static __inline__ void __arch_decomp_setup(unsigned long arch_id) break; case MACH_TYPE_MX51_BABBAGE: case MACH_TYPE_EUKREA_CPUIMX51SD: + case MACH_TYPE_MX51_3DS: uart_base = MX51_UART1_BASE_ADDR; break; case MACH_TYPE_MX50_RDP: |