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
..
aemif.h	davinci: add support for aemif timing configuration	2010-09-24 07:40:26 -07:00
asp.h	ASoC: davinci: let platform data define edma queue numbers	2010-07-20 09:57:20 +01:00
cdce949.h	davinci: add support for CDCE949 clock synthesizer	2010-02-04 13:29:58 -08:00
clock.h	davinci: major rework of clock, PLL, PSC infrastructure	2009-04-23 09:31:00 -07:00
common.h	ARM: 7190/1: restart: davinci: use new restart hook	2012-01-05 12:57:09 +00:00
cp_intc.h	Davinci: aintc/cpintc - use ioremap()	2010-05-13 10:05:28 -07:00
cpufreq.h	davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator	2009-11-25 10:21:37 -08:00
cpuidle.h	davinci: cpuidle: move mapping of DDR2 controller registers out of driver	2010-02-04 13:29:38 -08:00
cputype.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
da8xx.h	ARM: 7190/1: restart: davinci: use new restart hook	2012-01-05 12:57:09 +00:00
ddr2.h	ARM: mach-davinci: remove mach/memory.h	2011-10-13 12:49:47 -04:00
debug-macro.S	ARM: mach-davinci: clean up debug-macro.S	2011-09-26 10:11:28 -04:00
dm365.h	ARM: davinci: add back dummy header files	2012-02-27 14:55:22 +00:00
dm646x.h	ARM: davinci: add back dummy header files	2012-02-27 14:55:22 +00:00
edma.h	ARM: davinci: map default_queue to edma channels	2012-02-03 00:52:15 +05:30
entry-macro.S	ARM: davinci: remove unneeded mach/io.h include	2012-03-06 21:34:39 -06:00
gpio-davinci.h	ARM: 7040/1: mach-davinci: break out GPIO driver specifics	2011-08-22 09:12:56 +01:00
gpio.h	ARM: 7142/1: davinci: mark GPIO implementation complex	2011-11-05 19:09:47 +00:00
hardware.h	ARM: cleanups of io includes	2012-03-29 18:02:10 -07:00
i2c.h	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
irqs.h	Davinci: tnetv107x IRQ definitions	2010-05-06 15:02:05 -07:00
keyscan.h	Input: davinci_keyscan - add device_enable method to platform data	2010-01-06 00:17:11 -08:00
mmc.h	mmc: davinci: Add support for set_power callback	2011-09-17 15:53:23 +05:30
mux.h	ARM: davinci: DA850: Add GPIO pinmux configuration for wl1271	2011-09-17 15:53:22 +05:30
nand.h	mtd: nand: rename NAND_USE_FLASH_BBT	2011-09-11 15:01:56 +03:00
pm.h	davinci: add power management support	2010-02-04 13:29:55 -08:00
psc.h	ARM: davinci: psc: fix incorrect offsets	2011-12-05 16:47:15 +05:30
serial.h	ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset	2011-09-26 10:11:27 -04:00
spi.h	davinci: spi: move event queue parameter to platform data	2011-02-28 14:53:29 -08:00
sram.h	davinci: add SRAM allocator	2009-05-28 15:18:13 -07:00
time.h	davinci: Add watchdog base address flexibility	2009-05-26 08:20:31 -07:00
timex.h	davinci: explain CLOCK_TICK_RATE of 27MHz in include/mach/timex.h	2010-02-04 13:29:41 -08:00
tnetv107x.h	ARM: 7190/1: restart: davinci: use new restart hook	2012-01-05 12:57:09 +00:00
uncompress.h	ARM: create a common IOMEM definition	2012-03-13 21:22:09 -05:00
usb.h	DaVinci: rename setup_usb() to davinci_setup_usb()	2009-11-25 10:21:33 -08:00