Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
7a5cc24277
linux/sound/soc/pxa
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
..
corgi.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
e740_wm9705.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
e750_wm9705.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
e800_wm9712.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
em-x270.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
hx4700.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
imote2.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
Kconfig ASoC: Fix dependency for SND_SOC_RAUMFELD and SND_PXA2XX_SOC_HX4700 2011-12-04 23:47:16 +00:00
magician.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
Makefile ASoC: add iPAQ hx4700 machine driver 2011-05-19 14:10:59 -07:00
mioa701_wm9713.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
palm27x.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00
poodle.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
pxa2xx-ac97.c ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
pxa2xx-ac97.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
pxa2xx-i2s.c ASoC: Constify snd_soc_dai_ops structs 2011-11-23 10:40:46 +00:00
pxa2xx-i2s.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
pxa2xx-pcm.c ASoC: Convert pxa directory to module_platform_driver 2011-11-25 13:15:16 +00:00
pxa-ssp.c ASoC: pxa-ssp: atomically set stream active masks 2012-03-19 12:47:25 +00:00
pxa-ssp.h ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
raumfeld.c ASoC: Remove unnecessary -codec from cs4270 driver name 2012-02-28 12:35:20 +00:00
saarb.c ASoC: Convert saarb to table based DAPM init 2012-01-02 13:08:36 +00:00
spitz.c ASoC: Change spitz_ext_control to take dapm as argument. 2012-02-17 08:09:33 -08:00
tavorevb3.c ASoC: Use dai_fmt in tavorevb3 machine driver 2012-01-02 13:08:39 +00:00
tosa.c ASoC: core: Add support for DAI and machine kcontrols. 2012-02-04 12:40:11 +00:00
z2.c ASoC: Convert z2 to table based DAPM init 2012-01-02 13:08:38 +00:00
zylonite.c ASoC: pxa: Add .owner to struct snd_soc_card 2011-12-22 11:04:18 +00:00