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 'for-linus' of git://opensource.wolfsonmicro.com/regulator
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-bast.c
diff --git
a/arch/arm/mach-s3c2410/mach-bast.c
b/arch/arm/mach-s3c2410/mach-bast.c
index
1e2d536
..
a20ae1a
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-bast.c
+++ b/
arch/arm/mach-s3c2410/mach-bast.c
@@
-657,7
+657,7
@@
static void __init bast_init(void)
MACHINE_START(BAST, "Simtec-BAST")
/* Maintainer: Ben Dooks <ben@simtec.co.uk> */
MACHINE_START(BAST, "Simtec-BAST")
/* Maintainer: Ben Dooks <ben@simtec.co.uk> */
- .
boot_params = S3C2410_SDRAM_PA +
0x100,
+ .
atag_offset =
0x100,
.map_io = bast_map_io,
.init_irq = s3c24xx_init_irq,
.init_machine = bast_init,
.map_io = bast_map_io,
.init_irq = s3c24xx_init_irq,
.init_machine = bast_init,