Linus Torvalds 0950efd1a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6 ...

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6:
  pcmcia: document return value of pcmcia_loop_config
  pcmcia: dtl1_cs: fix pcmcia_loop_config logic
  pcmcia: drop non-existant includes
  pcmcia: disable prefetch/burst for OZ6933
  pcmcia: fix incorrect argument order to list_add_tail()
  pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
  pcmcia: Use phys_addr_t for physical addresses
  pcmcia: drivers/pcmcia: Make static

2009-09-16 08:11:23 -07:00

..

at91_cf.c

drivers/pcmcia: use nr_irqs

2008-10-16 16:52:06 +02:00

au1000_db1x00.c

pcmcia: replace remaining __FUNCTION__ occurrences

2008-05-01 08:04:00 -07:00

au1000_generic.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

au1000_generic.h

pcmcia: encapsulate ioaddr_t

2008-08-29 09:43:14 +02:00

au1000_pb1x00.c

pcmcia: drop non-existant includes

2009-09-15 10:17:16 -07:00

au1000_xxs1500.c

pcmcia: drop non-existant includes

2009-09-15 10:17:16 -07:00

bfin_cf_pcmcia.c

pcmcia: blackfin: fix bug - add missing ; to MODULE macro

2008-12-15 16:27:06 -08:00

cardbus.c

pcmcia: deprecate CS_SUCCESS

2008-08-23 02:29:26 +02:00

cirrus.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cistpl.c

pcmcia: add braces in error path

2008-11-02 19:55:45 +01:00

cs_internal.h

pcmcia: remove unused argument to pcmcia_parse_tuple()

2008-08-31 15:50:33 +02:00

cs.c

pcmcia: ensure correct logging in do_io_probe

2008-11-09 21:47:47 +01:00

ds.c

pcmcia: fix incorrect argument order to list_add_tail()

2009-09-15 10:17:16 -07:00

electra_cf.c

powerpc: Change u64/s64 to a long long integer type

2009-01-13 14:47:59 +11:00

i82092.c

pcmcia: remove CVS keywords

2008-06-24 15:33:37 +02:00

i82092aa.h

pcmcia: remove CVS keywords

2008-06-24 15:33:37 +02:00

i82365.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

i82365.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Kconfig

[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA

2009-06-05 10:46:32 +08:00

m8xx_pcmcia.c

pcmcia: don't add extra DEBUG cflag

2008-08-23 01:55:06 +02:00

m32r_cfc.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

m32r_cfc.h

[PATCH] m32r: Update m32r_cfc.[ch] to support Mappi-III platform

2005-06-21 19:07:30 -07:00

m32r_pcc.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

m32r_pcc.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile

[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA

2009-06-05 10:46:32 +08:00

o2micro.h

pcmcia: disable prefetch/burst for OZ6933

2009-09-15 10:17:16 -07:00

omap_cf.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

pcmcia_ioctl.c

pcmcia: drivers/pcmcia: Make static

2009-09-15 10:17:15 -07:00

pcmcia_resource.c

pcmcia: document return value of pcmcia_loop_config

2009-09-15 10:17:16 -07:00

pd6729.c

pcmcia: silence section mismatch warnings from pci_driver variables

2008-05-01 08:04:00 -07:00

pd6729.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

pxa2xx_base.c

[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0

2009-03-28 19:24:39 +08:00

pxa2xx_base.h

[ARM] Fix suspend oops caused by PXA2xx PCMCIA driver

2006-10-28 22:42:56 +01:00

pxa2xx_cm_x2xx.c

[ARM] 5283/1: pxa: add CM-X255 pcmcia support

2008-10-07 12:08:02 +01:00

pxa2xx_cm_x255.c

[ARM] 5442/1: pxa/cm-x255: fix reverse RDY gpios in PCMCIA driver

2009-04-02 11:02:32 +01:00

pxa2xx_cm_x270.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

2009-03-09 21:22:38 +08:00

pxa2xx_e740.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

2009-03-09 21:22:38 +08:00

pxa2xx_lubbock.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

2009-03-09 21:22:38 +08:00

pxa2xx_mainstone.c

[ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.h

2009-03-09 21:22:40 +08:00

pxa2xx_palmld.c

[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0

2009-03-28 19:24:39 +08:00

pxa2xx_palmtx.c

[ARM] 5198/1: PalmTX: PCMCIA fixes

2008-08-16 16:35:33 +01:00

pxa2xx_sharpsl.c

[ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config

2009-04-23 23:25:40 +01:00

pxa2xx_stargate2.c

[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA

2009-06-05 10:46:32 +08:00

pxa2xx_trizeps4.c

[ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.h

2009-03-09 21:22:40 +08:00

pxa2xx_viper.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

2009-03-09 21:22:38 +08:00

ricoh.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rsrc_mgr.c

pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()

2009-03-24 16:38:22 -07:00

rsrc_nonstatic.c

pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()

2008-11-02 15:05:51 +01:00

sa11xx_base.c

[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h

2009-03-25 10:21:35 +00:00

sa11xx_base.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sa1100_assabet.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

sa1100_badge4.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

sa1100_cerf.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

sa1100_generic.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

sa1100_generic.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sa1100_h3600.c

[ARM] 5426/1: h3600: remove clr_h3600_egpio/set_h3600_egpio helpers

2009-03-15 20:08:18 +00:00

sa1100_jornada720.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

sa1100_neponset.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

sa1100_shannon.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

sa1100_simpad.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

sa1111_generic.c

[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h

2009-03-25 10:21:35 +00:00

sa1111_generic.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

soc_common.c

[ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.c

2009-03-09 21:22:39 +08:00

soc_common.h

[ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.c

2009-03-09 21:22:39 +08:00

socket_sysfs.c

pcmcia: only copy CIS override data once

2008-08-02 18:56:49 +02:00

tcic.c

Remove multiple KERN_ prefixes from printk formats

2009-07-08 10:30:03 -07:00

tcic.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ti113x.h

pcmcia: use dev_printk and dev_dbg in yenta_socket

2008-08-23 01:49:44 +02:00

topic.h

[PATCH] yenta: make ToPIC95 bridges work with 16bit cards

2005-09-07 16:57:21 -07:00

vg468.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

vrc4171_card.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

vrc4173_cardu.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

vrc4173_cardu.h

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

yenta_socket.c

yenta: Use pci_claim_resource

2009-09-09 13:29:19 -07:00

yenta_socket.h

[PATCH] yenta: make ToPIC95 bridges work with 16bit cards

2005-09-07 16:57:21 -07:00