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-bcmring/include/mach/hardware.h | |
| 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-bcmring/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-bcmring/include/mach/hardware.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/hardware.h b/arch/arm/mach-bcmring/include/mach/hardware.h index ed78aabb8e9f..6ae20a649a97 100644 --- a/arch/arm/mach-bcmring/include/mach/hardware.h +++ b/arch/arm/mach-bcmring/include/mach/hardware.h | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #define __ASM_ARCH_HARDWARE_H | 22 | #define __ASM_ARCH_HARDWARE_H |
| 23 | 23 | ||
| 24 | #include <asm/sizes.h> | 24 | #include <asm/sizes.h> |
| 25 | #include <mach/memory.h> | ||
| 26 | #include <cfg_global.h> | 25 | #include <cfg_global.h> |
| 27 | #include <mach/csp/mm_io.h> | 26 | #include <mach/csp/mm_io.h> |
| 28 | 27 | ||
| @@ -31,7 +30,7 @@ | |||
| 31 | * *_SIZE is the size of the region | 30 | * *_SIZE is the size of the region |
| 32 | * *_BASE is the virtual address | 31 | * *_BASE is the virtual address |
| 33 | */ | 32 | */ |
| 34 | #define RAM_START PLAT_PHYS_OFFSET | 33 | #define RAM_START PHYS_OFFSET |
| 35 | 34 | ||
| 36 | #define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED) | 35 | #define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED) |
| 37 | #define RAM_BASE PAGE_OFFSET | 36 | #define RAM_BASE PAGE_OFFSET |