renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code
4a1e8ebc5e
linux-next/arch/arm/mach-sa1100
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: cleanups of io includes 2012-03-29 18:02:10 -07:00
assabet.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
badge4.c ARM: 7343/1: sa11x0: convert to sparse IRQ 2012-03-25 23:57:22 +01:00
cerf.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
clock.c ARM: sa1100: clean up clock support 2012-02-28 10:08:07 +08:00
collie.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
cpu-sa1100.c ARM: sa11x0: fix section mismatch in cpu-sa1100.c 2012-01-19 17:26:28 +00:00
cpu-sa1110.c ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. 2010-12-21 14:53:39 +00:00
generic.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
generic.h Merge branch 'sa11x0-mcp' into sa11x0 2012-03-25 23:57:10 +01:00
h3xxx.c ARM: sa11x0: convert to use DEFINE_RES_xxx macros 2012-02-09 15:34:12 +00:00
h3100.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
h3600.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
hackkit.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
irq.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
jornada720_ssp.c ARM: 7288/1: mach-sa1100: add missing module_init() call 2012-01-23 10:21:38 +00:00
jornada720.c ARM: 7343/1: sa11x0: convert to sparse IRQ 2012-03-25 23:57:22 +01:00
Kconfig ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
lart.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
leds-assabet.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-badge4.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-cerf.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-hackkit.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-lart.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds.c ARM: 7026/1: simpad: replace ARM specific LED code 2011-10-17 09:12:42 +01:00
leds.h ARM: 7026/1: simpad: replace ARM specific LED code 2011-10-17 09:12:42 +01:00
Makefile ARM: sa11x0: remove old SoC private DMA driver 2012-03-25 23:55:09 +01:00
Makefile.boot ARM: sa1100: fix build error 2011-12-08 14:55:57 +08:00
nanoengine.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
neponset.c ARM: 7343/1: sa11x0: convert to sparse IRQ 2012-03-25 23:57:22 +01:00
pci-nanoengine.c Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm 2012-03-27 18:17:02 -07:00
pleb.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
pm.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
shannon.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
simpad.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
sleep.S ARM: sa11x0: fix sleep entry 2012-02-09 15:34:11 +00:00
ssp.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00
time.c ARM: 7342/2: sa1100: prepare for sparse irq conversion 2012-03-25 23:57:20 +01:00