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://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop32x
/
iq80321.c
diff --git
a/arch/arm/mach-iop32x/iq80321.c
b/arch/arm/mach-iop32x/iq80321.c
index
35b7e69
..
53ea86f
100644
(file)
--- a/
arch/arm/mach-iop32x/iq80321.c
+++ b/
arch/arm/mach-iop32x/iq80321.c
@@
-186,7
+186,7
@@
static void __init iq80321_init_machine(void)
MACHINE_START(IQ80321, "Intel IQ80321")
/* Maintainer: Intel Corp. */
MACHINE_START(IQ80321, "Intel IQ80321")
/* Maintainer: Intel Corp. */
- .
boot_params = 0xa0000
100,
+ .
atag_offset = 0x
100,
.map_io = iq80321_map_io,
.init_irq = iop32x_init_irq,
.timer = &iq80321_timer,
.map_io = iq80321_map_io,
.init_irq = iop32x_init_irq,
.timer = &iq80321_timer,