[git pull] PCMCIA fixes and updates for 2.6.20-rc1

Dominik Brodowski linux at dominikbrodowski.net
Mon Dec 4 20:59:42 EST 2006


Hej,

Please pull from

	git://www.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git/

to merge the latest PCMCIA changes. Besides many fixes especially for
multifunction device handling (which missed 2.6.19, unfortunately), it
moves some duplicated device ID handling from the drivers to the core.

Individual patches for those patches which have not been sent out at the
git pull mail on Nov 19th will be sent to the linux-pcmcia list and,
if relevant, to other subsystem lists. 

Thanks,
	Dominik



The diffstat and list of changes follows:

----
 drivers/ata/pata_pcmcia.c               |   15 -
 drivers/bluetooth/bluecard_cs.c         |   38 ----
 drivers/bluetooth/bt3c_cs.c             |   20 --
 drivers/bluetooth/btuart_cs.c           |   20 --
 drivers/bluetooth/dtl1_cs.c             |   20 --
 drivers/char/pcmcia/cm4000_cs.c         |   26 ---
 drivers/char/pcmcia/cm4040_cs.c         |   26 ---
 drivers/char/pcmcia/synclink_cs.c       |    7 
 drivers/ide/legacy/ide-cs.c             |   20 --
 drivers/isdn/hardware/avm/avm_cs.c      |   36 ----
 drivers/isdn/hisax/avma1_cs.c           |   36 ----
 drivers/isdn/hisax/elsa_cs.c            |   17 --
 drivers/isdn/hisax/sedlbauer_cs.c       |   10 -
 drivers/isdn/hisax/teles_cs.c           |   17 --
 drivers/net/pcmcia/3c574_cs.c           |   25 --
 drivers/net/pcmcia/3c589_cs.c           |   19 --
 drivers/net/pcmcia/axnet_cs.c           |    6 
 drivers/net/pcmcia/com20020_cs.c        |   13 -
 drivers/net/pcmcia/fmvj18x_cs.c         |   40 +---
 drivers/net/pcmcia/ibmtr_cs.c           |   12 -
 drivers/net/pcmcia/nmclan_cs.c          |   12 -
 drivers/net/pcmcia/pcnet_cs.c           |   30 ---
 drivers/net/pcmcia/smc91c92_cs.c        |   59 +-----
 drivers/net/pcmcia/xirc2ps_cs.c         |   28 ---
 drivers/net/wireless/airo_cs.c          |   19 --
 drivers/net/wireless/atmel_cs.c         |   11 -
 drivers/net/wireless/hostap/hostap_cs.c |   13 -
 drivers/net/wireless/netwave_cs.c       |   18 --
 drivers/net/wireless/orinoco_cs.c       |   19 --
 drivers/net/wireless/ray_cs.c           |   30 ---
 drivers/net/wireless/spectrum_cs.c      |   19 --
 drivers/net/wireless/wavelan_cs.c       |   33 ---
 drivers/net/wireless/wl3501_cs.c        |   15 -
 drivers/parport/parport_cs.c            |    9 -
 drivers/pcmcia/at91_cf.c                |   69 ++------
 drivers/pcmcia/cs_internal.h            |    2 
 drivers/pcmcia/ds.c                     |  271 ++++++++++++++++++++++----------
 drivers/pcmcia/m32r_cfc.c               |    2 
 drivers/pcmcia/pcmcia_ioctl.c           |    7 
 drivers/pcmcia/pd6729.c                 |    8 
 drivers/pcmcia/socket_sysfs.c           |    4 
 drivers/scsi/pcmcia/aha152x_stub.c      |    7 
 drivers/scsi/pcmcia/fdomain_stub.c      |    5 
 drivers/scsi/pcmcia/nsp_cs.c            |    6 
 drivers/scsi/pcmcia/qlogic_stub.c       |   11 -
 drivers/scsi/pcmcia/sym53c500_cs.c      |   12 -
 drivers/serial/serial_cs.c              |   67 ++++---
 drivers/telephony/ixj_pcmcia.c          |   37 +---
 drivers/usb/host/sl811_cs.c             |   15 -
 include/pcmcia/ss.h                     |    5 
 sound/pcmcia/pdaudiocf/pdaudiocf.c      |   24 --
 sound/pcmcia/vx/vxpocket.c              |   26 ---
 52 files changed, 382 insertions(+), 934 deletions(-)
----
Adrian Bunk (1):
      pcmcia: fix m32r_cfc.c compilation

Akinobu Mita (1):
      cm4000_cs: fix return value check

Andrew Victor (2):
      pcmcia: at91_cf update
      pcmcia: at91_cf update

Dominik Brodowski (8):
      pcmcia: start over after CIS override
      pcmcia: multifunction card handling fixes
      pcmcia: handle __copy_from_user() return value in ioctl
      pcmcia: allow for four multifunction subdevices
      pcmcia: remove manf_id and card_id indirection
      pcmcia: remove prod_id indirection
      pcmcia: conf.ConfigBase and conf.Present consolidation
      pcmcia: ds.c debug enhancements

Komuro (1):
      pcmcia: allow shared IRQs on pd6729 sockets

Marcin Juszkiewicz (1):
      pcmcia: yet another IDE ID

Matt Reimer (1):
      pcmcia: Add an id to ide-cs.c

Tony Olech (1):
      pcmcia: IDs for Elan serial PCMCIA devcies




More information about the linux-pcmcia mailing list