alistair23-linux/arch/arm/mach-msm
Linus Torvalds 820d41cf0c ARM: cleanups of io includes
Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
 moving some of the oft-repeated macros to a common location and removing a bunch of
 boiler plate. This is another step closer to a common zImage for multiple platforms.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcpqHAAoJEIwa5zzehBx3xCMP/2evrPQyorzMBztrFB4Ry9Ol
 qNkSVNsemZjdtkY2dnJv+zJ/Xb0PPDU9EuBHr/SpqmVrRZEZeJND42wZK/OTFCBZ
 Ufi7KP1qE30daO5H3YmL+58/Ixir5fTHqggqolHhTcEYU2hnHgLBI4rIFu92kSO7
 TMyrAUs14jSkTVZc6HSF83w3PfQWhMzWvspJVHQ6RebZRruETAr7v9weVMbgxcDk
 jQ5XJ9y73rGs2AF8bZTpUdFPzkcac7UiHn3/XyqoZs8RNCL98BGpskzhILyTARf5
 X90c9mqQF+AEbb9QSDDd52uYFsJ/5COJvWdlExRI9gZZDI8Pd05ijZBR9IdGJg/B
 NsVsl98wvZ/zjHJ/Sb2qt5ruet7PiQUGhkshB42jVHsaWfRM030sKGYxQ8pX5Tsa
 cSagnfBCvAZ9VjDLkXrnEbWRNTz8LSwn9l63z0jmtm5D8+vbpMtgvtWARtuZ4RNn
 D8wIWoyT0ytVZnosu5441TEgCejtcKOEFzThvKDYMeMJZ/rqVkAbcznapoC2qUd4
 fceNlLfQFvW7xpY1MY8mhlwC0ki4hM9MSDieaXUyefvAU/hoSp8MveVUH5UspYfb
 0FpkEhzklW/g0/fuq0DJQIrMn7dajjUvVZIUQtiVQuFHOr6RUbFG5vmXuCbAyx10
 PE2K4rnKz+PC8bKab7v9
 =YIsn
 -----END PGP SIGNATURE-----

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: cleanups of io includes" from Olof Johansson:
 "Rob Herring has done a sweeping change cleaning up all of the
  mach/io.h includes, moving some of the oft-repeated macros to a common
  location and removing a bunch of boiler plate.  This is another step
  closer to a common zImage for multiple platforms."

Fix up various fairly trivial conflicts (<mach/io.h> removal vs changes
around it, tegra localtimer.o is *still* gone, yadda-yadda).

* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: tegra: Include assembler.h in sleep.S to fix build break
  ARM: pxa: use common IOMEM definition
  ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
  ARM: __io abuse cleanup
  ARM: create a common IOMEM definition
  ARM: iop13xx: fix missing declaration of iop13xx_init_early
  ARM: fix ioremap/iounmap for !CONFIG_MMU
  ARM: kill off __mem_pci
  ARM: remove bunch of now unused mach/io.h files
  ARM: make mach/io.h include optional
  ARM: clps711x: remove unneeded include of mach/io.h
  ARM: dove: add explicit include of dove.h to addr-map.c
  ARM: at91: add explicit include of hardware.h to uncompressor
  ARM: ep93xx: clean-up mach/io.h
  ARM: tegra: clean-up mach/io.h
  ARM: orion5x: clean-up mach/io.h
  ARM: davinci: remove unneeded mach/io.h include
  [media] davinci: remove includes of mach/io.h
  ARM: OMAP: Remove remaining includes for mach/io.h
  ARM: msm: clean-up mach/io.h
  ...
2012-03-29 18:02:10 -07:00
..
include/mach ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
acpuclock-arm11.c
acpuclock.h
board-halibut.c ARM: msm: use runtime ioremap hook 2012-03-06 21:23:17 -06:00
board-mahimahi.c
board-msm7x27.c
board-msm7x30.c msm: boards: Fix fallout from removal of machine_desc in fixup 2011-11-01 16:10:33 -07:00
board-msm8x60.c irq_domain: Remove irq_domain_add_simple() 2012-02-16 06:11:23 -07:00
board-msm8960.c ARM: msm: convert SMP platforms to CONFIG_MULTI_IRQ_HANDLER 2011-11-15 18:14:00 +00:00
board-qsd8x50.c
board-sapphire.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
board-trout-gpio.c
board-trout-mmc.c
board-trout-panel.c
board-trout.c ARM: msm: use runtime ioremap hook 2012-03-06 21:23:17 -06:00
board-trout.h
clock-7x30.h
clock-debug.c
clock-pcom.c
clock-pcom.h
clock.c
clock.h
devices-iommu.c iommu/msm: Fix compile error in mach-msm/devices-iommu.c 2011-12-06 11:17:34 +01:00
devices-msm7x00.c
devices-msm7x30.c
devices-msm8960.c
devices-qsd8x50.c
devices.h
dma.c
gpiomux-8x50.c
gpiomux-8x60.c
gpiomux-v1.c
gpiomux-v1.h
gpiomux-v2.c
gpiomux-v2.h
gpiomux.c
gpiomux.h
headsmp.S ARM: msm: Add missing ENDPROC to headsmp.S 2012-01-16 08:36:02 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
idle.c ARM: mach-msm: hook special idle handlers to arm_pm_idle 2012-01-20 18:55:15 -05:00
io.c ARM: msm: use runtime ioremap hook 2012-03-06 21:23:17 -06:00
irq-vic.c
irq.c
Kconfig Cleanups on various subarchitectures 2012-01-09 14:21:03 -08:00
last_radio_log.c
Makefile ARM: msm: fix compilation flags for MSM_SCM 2011-11-08 08:58:28 -08:00
Makefile.boot
platsmp.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
proc_comm.c
proc_comm.h
scm-boot.c
scm-boot.h
scm.c ARM: msm: fix compilation flags for MSM_SCM 2011-11-08 08:58:28 -08:00
scm.h
sirc.c
smd.c
smd_debug.c switch debugfs to umode_t 2012-01-03 22:54:56 -05:00
smd_private.h
timer.c Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm 2012-03-29 16:53:48 -07:00
vreg.c ARM: msm: vreg is a module and so needs module.h 2012-01-06 11:07:57 -08:00