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 branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2412
/
mach-smdk2413.c
diff --git
a/arch/arm/mach-s3c2412/mach-smdk2413.c
b/arch/arm/mach-s3c2412/mach-smdk2413.c
index
3391713
..
f1eec1b
100644
(file)
--- a/
arch/arm/mach-s3c2412/mach-smdk2413.c
+++ b/
arch/arm/mach-s3c2412/mach-smdk2413.c
@@
-127,7
+127,7
@@
static void __init smdk2413_machine_init(void)
MACHINE_START(S3C2413, "S3C2413")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
MACHINE_START(S3C2413, "S3C2413")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
- .
boot_params = S3C2410_SDRAM_PA +
0x100,
+ .
atag_offset =
0x100,
.fixup = smdk2413_fixup,
.init_irq = s3c24xx_init_irq,
.fixup = smdk2413_fixup,
.init_irq = s3c24xx_init_irq,
@@
-138,7
+138,7
@@
MACHINE_END
MACHINE_START(SMDK2412, "SMDK2412")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
MACHINE_START(SMDK2412, "SMDK2412")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
- .
boot_params = S3C2410_SDRAM_PA +
0x100,
+ .
atag_offset =
0x100,
.fixup = smdk2413_fixup,
.init_irq = s3c24xx_init_irq,
.fixup = smdk2413_fixup,
.init_irq = s3c24xx_init_irq,
@@
-149,7
+149,7
@@
MACHINE_END
MACHINE_START(SMDK2413, "SMDK2413")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
MACHINE_START(SMDK2413, "SMDK2413")
/* Maintainer: Ben Dooks <ben-linux@fluff.org> */
- .
boot_params = S3C2410_SDRAM_PA +
0x100,
+ .
atag_offset =
0x100,
.fixup = smdk2413_fixup,
.init_irq = s3c24xx_init_irq,
.fixup = smdk2413_fixup,
.init_irq = s3c24xx_init_irq,