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 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-ks8695
/
board-acs5k.c
diff --git
a/arch/arm/mach-ks8695/board-acs5k.c
b/arch/arm/mach-ks8695/board-acs5k.c
index
3d7d114
..
a91f99d
100644
(file)
--- a/
arch/arm/mach-ks8695/board-acs5k.c
+++ b/
arch/arm/mach-ks8695/board-acs5k.c
@@
-223,7
+223,7
@@
static void __init acs5k_init(void)
MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board")
/* Maintainer: Simtec Electronics. */
- .
boot_params = KS8695_SDRAM_PA +
0x100,
+ .
atag_offset =
0x100,
.map_io = ks8695_map_io,
.init_irq = ks8695_init_irq,
.init_machine = acs5k_init,