UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch/arm/mach-orion5x
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
..
include/mach ARM: remove bunch of now unused mach/io.h files 2012-03-06 21:34:44 -06:00
Kconfig [ARM] Orion: added Buffalo LS-CHL support 2010-12-07 13:50:04 -05:00
Makefile [ARM] Orion: added Buffalo LS-CHL support 2010-12-07 13:50:04 -05:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
addr-map.c ARM: Orion: mbus_dram_info consolidation 2011-12-13 18:46:55 -05:00
common.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
common.h ARM: orion5x: clean-up mach/io.h 2012-03-06 21:34:40 -06:00
d2net-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
db88f5281-setup.c mach-orion5x: Fix typo in db88f5281-setup.c and rd88f5182-setup.c 2012-02-21 11:40:36 +01:00
dns323-setup.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
edmini_v2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
irq.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
kurobox_pro-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ls-chl-setup.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
ls_hgl-setup.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
lsmini-setup.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
mpp.c ARM: Orion: Get address map from plat-orion instead of via platform_data 2011-12-13 18:46:55 -05:00
mpp.h ARM: orion5x: Refactor mpp code to use common orion platform mpp. 2011-05-16 15:42:59 -04:00
mss2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
mv2120-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
net2big-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
pci.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
rd88f5181l-fxo-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
rd88f5181l-ge-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
rd88f5182-setup.c mach-orion5x: Fix typo in db88f5281-setup.c and rd88f5182-setup.c 2012-02-21 11:40:36 +01:00
rd88f6183ap-ge-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
terastation_pro2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ts78xx-fpga.h ARM: orion5x: use safer FPGA ID 'default' for TS-78xx 2011-03-05 14:31:53 -05:00
ts78xx-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ts209-setup.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
ts409-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
tsx09-common.c ARM: orion5x: clean-up mach/io.h 2012-03-06 21:34:40 -06:00
tsx09-common.h [ARM] Orion: remove code duplication in TS209 and TS409 setup files 2008-06-22 22:44:54 +02:00
wnr854t-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
wrt350n-v2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00