Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 15:19:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
linux/drivers/pcmcia
History
Linus Torvalds a6f707b601 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia 
Pull a few PCMCIA updates from Dominik Brodowski.

Fix up trivial conflict (modified code in question had been removed) in
drivers/pcmcia/soc_common.c.

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia:
  pcmcia at91_cf: fix raw gpio number usage
  ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
  pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
  pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
  pcmcia: irq: Remove IRQF_DISABLED
2012-03-29 16:00:48 -07:00
..
at91_cf.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
bcm63xx_pcmcia.c
pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
2012-03-03 14:43:37 +01:00
bcm63xx_pcmcia.h
MIPS: BCM63xx: Add PCMCIA & Cardbus support.
2009-09-30 21:47:01 +02:00
bfin_cf_pcmcia.c
pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
2012-03-03 14:43:37 +01:00
cardbus.c
PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
2012-02-27 12:14:55 -08:00
cirrus.h
pcmcia: drop already defined PCI_IDs
2009-10-24 17:13:01 +02:00
cistpl.c
pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
2010-09-29 17:20:23 +02:00
cs_internal.h
pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
2010-09-29 17:20:23 +02:00
cs.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
db1xxx_ss.c
pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
2012-03-03 14:43:37 +01:00
ds.c
Merge 3.3-rc6 into driver-core-next
2012-03-09 12:35:53 -08:00
electra_cf.c
pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
2012-03-03 14:43:37 +01:00
i82092.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
i82092aa.h
pcmcia: remove CVS keywords
2008-06-24 15:33:37 +02:00
i82365.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
i82365.h
pcmcia: honor saved flags in yenta_socket's I365_CSCINT register
2010-03-15 14:50:15 +01:00
Kconfig
PCMCIA: make lubbock socket driver part of sa1111_cs
2012-02-21 14:27:18 +00: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
tree-wide: fix comment/printk typos
2010-11-01 15:38:34 -04:00
m32r_pcc.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
m32r_pcc.h
tree-wide: fix comment/printk typos
2010-11-01 15:38:34 -04:00
Makefile
PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix.
2012-02-21 14:27:18 +00:00
o2micro.h
pcmcia/yenta: guide users in case of problems with O2-bridges
2010-10-15 14:31:47 +02:00
omap_cf.c
pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket
2010-05-10 10:23:12 +02:00
pcmcia_cis.c
pcmcia: use autoconfiguration feature for ioports and iomem
2010-09-29 17:20:24 +02:00
pcmcia_resource.c
Revert wrong fixes for common misspellings
2011-04-26 23:31:11 -07:00
pd6729.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
pd6729.h
pd6729: Coding Style fixes
2010-11-10 14:29:09 +01:00
pxa2xx_balloon3.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_base.c
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
pxa2xx_base.h
pcmcia vs. MECR on pxa25x/sa1111
2011-02-19 12:22:35 +01:00
pxa2xx_cm_x2xx.c
ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
2011-11-05 22:26:46 +00:00
pxa2xx_cm_x255.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_cm_x270.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_colibri.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_e740.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_mainstone.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_palmld.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_palmtc.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_palmtx.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_sharpsl.c
PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio management
2012-02-04 14:32:22 +00:00
pxa2xx_stargate2.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_trizeps4.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
pxa2xx_viper.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
pxa2xx_vpac270.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
ricoh.h
Linux-2.6.12-rc2
2005-04-16 15:20:36 -07:00
rsrc_iodyn.c
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
rsrc_mgr.c
pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
2010-09-29 17:20:23 +02:00
rsrc_nonstatic.c
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
sa11xx_base.c
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
sa11xx_base.h
PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
2009-11-09 08:30:11 +01:00
sa1100_assabet.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
sa1100_cerf.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
sa1100_generic.c
pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data
2011-05-06 07:46:11 +02:00
sa1100_generic.h
ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.
2010-12-21 14:53:45 +00:00
sa1100_h3600.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
sa1100_nanoengine.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
sa1100_shannon.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00:00
sa1100_simpad.c
PCMCIA: soc_common: remove explicit wrprot initialization in socket drivers
2012-02-21 14:27:04 +00: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
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
2012-03-27 18:17:02 -07:00
sa1111_generic.h
PCMCIA: sa1111: use new per-socket irq/gpio infrastructure
2012-02-04 14:32:23 +00:00
sa1111_jornada720.c
PCMCIA: sa1111: rename sa1111 socket drivers to have sa1111_ prefix.
2012-02-21 14:27:18 +00: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
PCMCIA: soc_common: remove soc_pcmcia_*_irqs functions
2012-02-21 14:27:03 +00:00
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
Linux-2.6.12-rc2
2005-04-16 15:20:36 -07:00
ti113x.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
topic.h
pcmcia: correct handling for Zoomed Video registers in topic.h
2009-11-11 19:34:27 +01:00
vg468.h
Linux-2.6.12-rc2
2005-04-16 15:20:36 -07:00
vrc4171_card.c
pcmcia: use dev_pm_ops for class pcmcia_socket_class
2010-03-24 11:00:11 +01:00
vrc4173_cardu.c
pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
2012-03-03 14:43:37 +01:00
vrc4173_cardu.h
Update Yoichi Yuasa's e-mail address
2009-07-03 15:45:29 +01:00
xxs1500_ss.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
yenta_socket.c
pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE
2012-03-03 14:43:37 +01:00
yenta_socket.h
[PATCH] yenta: make ToPIC95 bridges work with 16bit cards
2005-09-07 16:57:21 -07:00