diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:40:15 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:40:15 +0000 |
| commit | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (patch) | |
| tree | 06e5789cb33d0547c2497fd4d0327dc9e8614d37 /arch/arm/mach-s5p6440/mach-smdk6440.c | |
| parent | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (diff) | |
| parent | d608c738bb8fb37e5fbfcdef9c566764f2fea086 (diff) | |
| download | op-kernel-dev-882d01f96bc1909455696aae6eb7ce4df3e908c8.zip op-kernel-dev-882d01f96bc1909455696aae6eb7ce4df3e908c8.tar.gz | |
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-s5p6440/mach-smdk6440.c')
| -rw-r--r-- | arch/arm/mach-s5p6440/mach-smdk6440.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s5p6440/mach-smdk6440.c b/arch/arm/mach-s5p6440/mach-smdk6440.c index 760ea54..3ae88f2 100644 --- a/arch/arm/mach-s5p6440/mach-smdk6440.c +++ b/arch/arm/mach-s5p6440/mach-smdk6440.c @@ -100,8 +100,8 @@ static void __init smdk6440_machine_init(void) MACHINE_START(SMDK6440, "SMDK6440") /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ - .phys_io = S5P_PA_UART & 0xfff00000, - .io_pg_offst = (((u32)S5P_VA_UART) >> 18) & 0xfffc, + .phys_io = S3C_PA_UART & 0xfff00000, + .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc, .boot_params = S5P_PA_SDRAM + 0x100, .init_irq = s5p6440_init_irq, |
