diff options
| 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-kirkwood/sheevaplug-setup.c | |
| parent | f362f98e7c445643d27c610bb7a86b79727b592e (diff) | |
| parent | 531a6a941745e1e045dd2a6bd09e1dc01247a5f3 (diff) | |
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.
Diffstat (limited to 'arch/arm/mach-kirkwood/sheevaplug-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c index 17de0bf53c08..8b102d62e82c 100644 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c | |||
| @@ -138,7 +138,7 @@ static void __init sheevaplug_init(void) | |||
| 138 | #ifdef CONFIG_MACH_SHEEVAPLUG | 138 | #ifdef CONFIG_MACH_SHEEVAPLUG |
| 139 | MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") | 139 | MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") |
| 140 | /* Maintainer: shadi Ammouri <shadi@marvell.com> */ | 140 | /* Maintainer: shadi Ammouri <shadi@marvell.com> */ |
| 141 | .boot_params = 0x00000100, | 141 | .atag_offset = 0x100, |
| 142 | .init_machine = sheevaplug_init, | 142 | .init_machine = sheevaplug_init, |
| 143 | .map_io = kirkwood_map_io, | 143 | .map_io = kirkwood_map_io, |
| 144 | .init_early = kirkwood_init_early, | 144 | .init_early = kirkwood_init_early, |
| @@ -149,7 +149,7 @@ MACHINE_END | |||
| 149 | 149 | ||
| 150 | #ifdef CONFIG_MACH_ESATA_SHEEVAPLUG | 150 | #ifdef CONFIG_MACH_ESATA_SHEEVAPLUG |
| 151 | MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board") | 151 | MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board") |
| 152 | .boot_params = 0x00000100, | 152 | .atag_offset = 0x100, |
| 153 | .init_machine = sheevaplug_init, | 153 | .init_machine = sheevaplug_init, |
| 154 | .map_io = kirkwood_map_io, | 154 | .map_io = kirkwood_map_io, |
| 155 | .init_early = kirkwood_init_early, | 155 | .init_early = kirkwood_init_early, |