Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
author: Linus Torvalds <torvalds@linux-foundation.org> 2011-10-28 15:02:27 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2011-10-28 15:02:27 -0400
commit: 1fdb24e969110fafea36d3b393bea438f702c87f (patch)
tree: 47a1dfef8a259e7922285315f8a02d31b4efe2f1 /arch/arm/mach-ixp2000/ixdp2x01.c
parent: f362f98e7c445643d27c610bb7a86b79727b592e (diff)
parent: 531a6a941745e1e045dd2a6bd09e1dc01247a5f3 (diff)
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index be2a254f1374..61a28676b5be 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -417,7 +417,7 @@ static void __init ixdp2x01_init_machine(void)
 #ifdef CONFIG_ARCH_IXDP2401
 MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
        /* Maintainer: MontaVista Software, Inc. */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
        .map_io         = ixdp2x01_map_io,
        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
@@ -428,7 +428,7 @@ MACHINE_END
 #ifdef CONFIG_ARCH_IXDP2801
 MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
        /* Maintainer: MontaVista Software, Inc. */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
        .map_io         = ixdp2x01_map_io,
        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
@@ -441,7 +441,7 @@ MACHINE_END
 */
 MACHINE_START(IXDP28X5, "Intel IXDP2805/2855 Development Platform")
        /* Maintainer: MontaVista Software, Inc. */
-        .boot_params    = 0x00000100,
+        .atag_offset    = 0x100,
        .map_io         = ixdp2x01_map_io,
        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
author	Linus Torvalds <torvalds@linux-foundation.org>	2011-10-28 15:02:27 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2011-10-28 15:02:27 -0400
commit	1fdb24e969110fafea36d3b393bea438f702c87f (patch)
tree	47a1dfef8a259e7922285315f8a02d31b4efe2f1 /arch/arm/mach-ixp2000/ixdp2x01.c
parent	f362f98e7c445643d27c610bb7a86b79727b592e (diff)
parent	531a6a941745e1e045dd2a6bd09e1dc01247a5f3 (diff)

diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index be2a254f1374..61a28676b5be 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -417,7 +417,7 @@ static void __init ixdp2x01_init_machine(void)
417	#ifdef CONFIG_ARCH_IXDP2401	417	#ifdef CONFIG_ARCH_IXDP2401
418	MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")	418	MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
419	/* Maintainer: MontaVista Software, Inc. */	419	/* Maintainer: MontaVista Software, Inc. */
420	.boot_params = 0x00000100,	420	.atag_offset = 0x100,
421	.map_io = ixdp2x01_map_io,	421	.map_io = ixdp2x01_map_io,
422	.init_irq = ixdp2x01_init_irq,	422	.init_irq = ixdp2x01_init_irq,
423	.timer = &ixdp2x01_timer,	423	.timer = &ixdp2x01_timer,
@@ -428,7 +428,7 @@ MACHINE_END
428	#ifdef CONFIG_ARCH_IXDP2801	428	#ifdef CONFIG_ARCH_IXDP2801
429	MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")	429	MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
430	/* Maintainer: MontaVista Software, Inc. */	430	/* Maintainer: MontaVista Software, Inc. */
431	.boot_params = 0x00000100,	431	.atag_offset = 0x100,
432	.map_io = ixdp2x01_map_io,	432	.map_io = ixdp2x01_map_io,
433	.init_irq = ixdp2x01_init_irq,	433	.init_irq = ixdp2x01_init_irq,
434	.timer = &ixdp2x01_timer,	434	.timer = &ixdp2x01_timer,
@@ -441,7 +441,7 @@ MACHINE_END
441	*/	441	*/
442	MACHINE_START(IXDP28X5, "Intel IXDP2805/2855 Development Platform")	442	MACHINE_START(IXDP28X5, "Intel IXDP2805/2855 Development Platform")
443	/* Maintainer: MontaVista Software, Inc. */	443	/* Maintainer: MontaVista Software, Inc. */
444	.boot_params = 0x00000100,	444	.atag_offset = 0x100,
445	.map_io = ixdp2x01_map_io,	445	.map_io = ixdp2x01_map_io,
446	.init_irq = ixdp2x01_init_irq,	446	.init_irq = ixdp2x01_init_irq,
447	.timer = &ixdp2x01_timer,	447	.timer = &ixdp2x01_timer,