linux/arch/arm/mach-nomadik/include/mach
Linus Torvalds 1fdb24e969 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.
2011-10-28 12:02:27 -07:00
..
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
entry-macro.S [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
fsmc.h mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board) 2009-09-20 05:59:42 -07:00
gpio.h ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h> 2011-08-23 15:30:04 +01:00
hardware.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
io.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
irqs.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
nand.h mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board) 2009-09-20 05:59:42 -07:00
setup.h ARM: 5786/1: Introduce plat-nomadik, MTU code re-organization 2009-11-28 10:22:51 +00:00
system.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
timex.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
uncompress.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00:00