leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
884924be2a
linux/arch/arm/mach-shmobile/include/mach
History
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
..
clkdev.h
common.h Merge branch 'renesas/timer' into next/timer 2012-03-20 09:41:43 +00:00
dma.h
gpio.h ARM: 7244/1: mach-shmobile: Use CONFIG_ARCH_NR_GPIO 2011-12-23 22:54:51 +00:00
hardware.h ARM: mach-shmobile: Rely on run-time IRQ handlers 2011-01-07 10:43:02 +09:00
head-ap4evb.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
head-mackerel.txt ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot 2011-05-24 12:15:20 +09:00
intc.h ARM: mach-shmobile: Add support for PINT though INTC macros 2011-11-05 01:03:55 +09:00
irqs.h ARM: shmobile: remove NR_IRQS 2012-01-25 20:37:51 -06:00
memory.h ARM: mach-shmobile: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
mmc-ap4eb.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc-mackerel.h mmc, ARM: Rename SuperH Mobile ARM zboot helpers 2011-03-25 01:24:57 +09:00
mmc.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00
r8a7740.h ARM: mach-shmobile: R-Mobile A1 support. 2011-11-11 16:55:31 +09:00
r8a7779.h ARM: mach-shmobile: r8a7779 SMP support V3 2012-01-12 11:00:27 +09:00
sdhi-sh7372.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sdhi.h ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM 2011-06-29 10:00:52 +01:00
sh73a0.h ARM: mach-shmobile: sh73a0 PINT IRQ base fix 2012-01-18 10:12:56 +10:00
sh7367.h ARM: mach-shmobile: sh7367 and G3EVM pinmux support 2010-02-12 14:10:47 +09:00
sh7372.h PM / shmobile: Remove the stay_on flag from SH7372's PM domains 2011-12-25 23:39:27 +01:00
sh7377.h ARM: mach-shmobile: sh7377 and G4EVM pinmux support 2010-02-15 13:43:37 +09:00
system.h Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
timex.h
uncompress.h
zboot_macros.h ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM 2010-12-05 08:40:21 +00:00
zboot.h ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL 2011-04-06 11:08:20 -07:00