leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fe9c1db2cf
linux/drivers/pcmcia
History
Linus Torvalds 8287361abc ARM: arm-soc: Header cleanups 
This is a collection of header file cleanups, mostly for OMAP and AT91,
 that keeps moving the platforms in the direction of multiplatform by
 removing the need for mach-dependent header files used in drivers and
 other places.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJQx2reAAoJEIwa5zzehBx3Z/oQAIHp8aXbUD0GvbBPQ2vIydZ8
 Qfdh2ypbyFB9GSLmPP6BhurEFUcwmW3MH2r9Kq68omPt4XxrFEt1SdEn3TgZlhTY
 YYzEv2DLbWfmKCDBFAEFullsfVkrpggyou5ty30YVp/u2lVLvChpkciE5/9HADy5
 uoh/W2KZcLE51tvnbRy/1DBaOtxEdCjJ9hTaef7FCB9ugOG+yMDYwIPRW/b4fNA6
 o/1NuZTWp0H4ePRG2oqLxYnjSiF63DVTJZjSJ+c5gW34bWgh8+/xzaLFA9U++/ig
 meGUD1Oe65+ctr+Wk2mV29eb02jauUe6qvkwt+iFIDDopgc2mn5BcW+ENpgpjhe3
 6l3ClRd94qh4cMWzqDa5PZCdetshiKqSH2IGpKS/dHNB1h5sBP7CCbvbalwzWd5n
 qjfkPC7kSFyU3XV+9SEAXE6HLKsiMQy9kRcKOMdTE5BA4FEAZk0wfiG9WcVCvS2D
 9tDC3X0aScyXx4Mkd4wIAZVhY68QuI17fPft9zZSj691YiUW5cR2yF1qbCka0yd5
 pHu/QSZg1+dUitMUvMPQmWJ15jnAtEYUtV/8zQFFVchgkxlrW+UtvW3zxghB6D+J
 ZwcjAMfQQz9fLoMQXlVovjQIhYsjw3SlV62ReBH7eyPs3+KfPIBn7Ks6mVQs3dS5
 AMUWORsB5u92XHl9EL9C
 =aggA
 -----END PGP SIGNATURE-----

Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC Header cleanups from Olof Johansson:
 "This is a collection of header file cleanups, mostly for OMAP and
  AT91, that keeps moving the platforms in the direction of
  multiplatform by removing the need for mach-dependent header files
  used in drivers and other places."

Fix up mostly trivial conflicts as per Olof.

* tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits)
  ARM: OMAP2+: Move iommu/iovmm headers to platform_data
  ARM: OMAP2+: Make some definitions local
  ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
  ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
  ARM: OMAP2+: Move iopgtable header to drivers/iommu/
  ARM: OMAP: Merge iommu2.h into iommu.h
  atmel: move ATMEL_MAX_UART to platform_data/atmel.h
  ARM: OMAP: Remove omap_init_consistent_dma_size()
  arm: at91: move at91rm9200 rtc header in drivers/rtc
  arm: at91: move reset controller header to arm/arm/mach-at91
  arm: at91: move pit define to the driver
  arm: at91: move at91_shdwc.h to arch/arm/mach-at91
  arm: at91: move board header to arch/arm/mach-at91
  arn: at91: move at91_tc.h to arch/arm/mach-at91
  arm: at91 move at91_aic.h to arch/arm/mach-at91
  arm: at91 move board.h to arch/arm/mach-at91
  arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
  arm: at91: drop machine defconfig
  ARM: OMAP: Remove NEED_MACH_GPIO_H
  ARM: OMAP: Remove unnecessary mach and plat includes
  ...
2012-12-12 11:45:16 -08:00
..
at91_cf.c arm: at91: move platfarm_data to include/linux/platform_data/atmel.h 2012-11-06 20:29:33 +08:00
bcm63xx_pcmcia.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
cardbus.c pcmcia: Use common pci_stop_and_remove_bus_device() 2012-08-22 11:31:20 -06:00
cirrus.h
cistpl.c
cs_internal.h
cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
db1xxx_ss.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
ds.c pcmcia: remove use of __devinit 2012-11-28 12:10:16 -08:00
electra_cf.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
i82092.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
i82092aa.h
i82365.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
i82365.h
Kconfig pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08:00
m8xx_pcmcia.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 2012-03-29 16:00:48 -07:00
m32r_cfc.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
m32r_cfc.h
m32r_pcc.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
m32r_pcc.h
Makefile pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08:00
o2micro.h
omap_cf.c ARM: OMAP1: Move plat/tc.h to mach/tc.h for omap1 2012-10-17 11:36:40 -07:00
pcmcia_cis.c
pcmcia_resource.c
pd6729.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
pd6729.h
pxa2xx_balloon3.c
pxa2xx_base.c ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe() 2012-09-21 15:33:58 +08:00
pxa2xx_base.h
pxa2xx_cm_x2xx.c
pxa2xx_cm_x255.c
pxa2xx_cm_x270.c
pxa2xx_colibri.c
pxa2xx_e740.c
pxa2xx_hx4700.c pcmcia: add driver for hx4700 2012-05-07 09:56:39 +08:00
pxa2xx_mainstone.c
pxa2xx_palmld.c
pxa2xx_palmtc.c
pxa2xx_palmtx.c
pxa2xx_sharpsl.c pcmcia: remove use of __devinit 2012-11-28 12:10:16 -08:00
pxa2xx_stargate2.c
pxa2xx_trizeps4.c
pxa2xx_viper.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa2xx_vpac270.c
ricoh.h
rsrc_iodyn.c
rsrc_mgr.c
rsrc_nonstatic.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
sa11xx_base.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
sa11xx_base.h
sa1100_assabet.c pcmcia: remove use of __devinit 2012-11-28 12:10:16 -08:00
sa1100_cerf.c pcmcia: remove use of __devinit 2012-11-28 12:10:16 -08:00
sa1100_generic.c pcmcia: remove use of __devinitdata 2012-11-28 12:10:16 -08:00
sa1100_generic.h
sa1100_h3600.c pcmcia: remove use of __devinit 2012-11-28 12:10:16 -08:00
sa1100_nanoengine.c
sa1100_shannon.c pcmcia: remove use of __devinit 2012-11-28 12:10:16 -08:00
sa1100_simpad.c pcmcia: remove use of __devinit 2012-11-28 12:10:16 -08:00
sa1111_badge4.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
sa1111_generic.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
sa1111_generic.h
sa1111_jornada720.c pcmcia: remove use of __devinit 2012-11-28 12:10:16 -08:00
sa1111_lubbock.c PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix. 2012-02-21 14:27:18 +00:00
sa1111_neponset.c Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm 2012-03-27 18:17:02 -07:00
soc_common.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
soc_common.h
socket_sysfs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
tcic.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
tcic.h
ti113x.h
topic.h
vg468.h
vrc4171_card.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
vrc4173_cardu.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
vrc4173_cardu.h
xxs1500_ss.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
yenta_socket.c pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
yenta_socket.h