git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-smdk6400.c
diff --git
a/arch/arm/mach-s3c64xx/mach-smdk6400.c
b/arch/arm/mach-s3c64xx/mach-smdk6400.c
index
5991667
..
6fd5e95
100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smdk6400.c
+++ b/
arch/arm/mach-s3c64xx/mach-smdk6400.c
@@
-85,9
+85,7
@@
static void __init smdk6400_machine_init(void)
MACHINE_START(SMDK6400, "SMDK6400")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
MACHINE_START(SMDK6400, "SMDK6400")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
- .phys_io = S3C_PA_UART & 0xfff00000,
- .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc,
- .boot_params = S3C64XX_PA_SDRAM + 0x100,
+ .atag_offset = 0x100,
.init_irq = s3c6400_init_irq,
.map_io = smdk6400_map_io,
.init_irq = s3c6400_init_irq,
.map_io = smdk6400_map_io,