Commit 54291263519ac2c9bdda68b23b02fef3808deed4
Exists in
master
and in
4 other branches
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (29 commits)
pcmcia: disable PCMCIA ioctl also for ARM
drivers/staging/comedi: dev_node removal (quatech_daqp_cs)
drivers/staging/comedi: dev_node removal (ni_mio_cs)
drivers/staging/comedi: dev_node removal (ni_labpc_cs)
drivers/staging/comedi: dev_node removal (ni_daq_dio24)
drivers/staging/comedi: dev_node removal (ni_daq_700)
drivers/staging/comedi: dev_node removal (das08_cs)
drivers/staging/comedi: dev_node removal (cb_das16_cs)
pata_pcmcia: get rid of extra indirection
pcmcia: remove suspend-related comment from yenta_socket.c
pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held
pcmcia: remove pcmcia_add_device_lock
pcmcia: update gfp/slab.h includes
pcmcia: remove unused mem_op.h
pcmcia: do not autoadd root PCI bus resources
pcmcia: clarify alloc_io_space, move it to resource handlers
pcmcia: move all pcmcia_resource_ops providers into one module
pcmcia: move high level CIS access code to separate file
pcmcia: dev_node removal (core)
pcmcia: dev_node removal (remaining drivers)
...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 86 changed files Side-by-side Diff
- Documentation/pcmcia/driver-changes.txt
- drivers/ata/pata_pcmcia.c
- drivers/bluetooth/bluecard_cs.c
- drivers/bluetooth/bt3c_cs.c
- drivers/bluetooth/btuart_cs.c
- drivers/bluetooth/dtl1_cs.c
- drivers/char/pcmcia/cm4000_cs.c
- drivers/char/pcmcia/cm4040_cs.c
- drivers/char/pcmcia/ipwireless/main.c
- drivers/char/pcmcia/ipwireless/main.h
- drivers/char/pcmcia/ipwireless/tty.c
- drivers/char/pcmcia/ipwireless/tty.h
- drivers/char/pcmcia/synclink_cs.c
- drivers/ide/ide-cs.c
- drivers/isdn/hardware/avm/avm_cs.c
- drivers/isdn/hisax/avma1_cs.c
- drivers/isdn/hisax/elsa_cs.c
- drivers/isdn/hisax/sedlbauer_cs.c
- drivers/isdn/hisax/teles_cs.c
- drivers/mtd/maps/pcmciamtd.c
- drivers/net/pcmcia/3c574_cs.c
- drivers/net/pcmcia/3c589_cs.c
- drivers/net/pcmcia/axnet_cs.c
- drivers/net/pcmcia/com20020_cs.c
- drivers/net/pcmcia/fmvj18x_cs.c
- drivers/net/pcmcia/ibmtr_cs.c
- drivers/net/pcmcia/nmclan_cs.c
- drivers/net/pcmcia/pcnet_cs.c
- drivers/net/pcmcia/smc91c92_cs.c
- drivers/net/pcmcia/xirc2ps_cs.c
- drivers/net/wireless/airo_cs.c
- drivers/net/wireless/atmel_cs.c
- drivers/net/wireless/b43/pcmcia.c
- drivers/net/wireless/hostap/hostap_cs.c
- drivers/net/wireless/libertas/if_cs.c
- drivers/net/wireless/orinoco/orinoco_cs.c
- drivers/net/wireless/orinoco/spectrum_cs.c
- drivers/net/wireless/ray_cs.c
- drivers/net/wireless/ray_cs.h
- drivers/net/wireless/wl3501.h
- drivers/net/wireless/wl3501_cs.c
- drivers/parport/parport_cs.c
- drivers/pcmcia/Kconfig
- drivers/pcmcia/Makefile
- drivers/pcmcia/bfin_cf_pcmcia.c
- drivers/pcmcia/cardbus.c
- drivers/pcmcia/cistpl.c
- drivers/pcmcia/cs.c
- drivers/pcmcia/cs_internal.h
- drivers/pcmcia/ds.c
- drivers/pcmcia/omap_cf.c
- drivers/pcmcia/pcmcia_cis.c
- drivers/pcmcia/pcmcia_ioctl.c
- drivers/pcmcia/pcmcia_resource.c
- drivers/pcmcia/rsrc_iodyn.c
- drivers/pcmcia/rsrc_mgr.c
- drivers/pcmcia/rsrc_nonstatic.c
- drivers/pcmcia/yenta_socket.c
- drivers/scsi/pcmcia/aha152x_stub.c
- drivers/scsi/pcmcia/fdomain_stub.c
- drivers/scsi/pcmcia/nsp_cs.c
- drivers/scsi/pcmcia/nsp_cs.h
- drivers/scsi/pcmcia/qlogic_stub.c
- drivers/scsi/pcmcia/sym53c500_cs.c
- drivers/serial/serial_cs.c
- drivers/ssb/main.c
- drivers/staging/comedi/drivers/cb_das16_cs.c
- drivers/staging/comedi/drivers/das08_cs.c
- drivers/staging/comedi/drivers/ni_daq_700.c
- drivers/staging/comedi/drivers/ni_daq_dio24.c
- drivers/staging/comedi/drivers/ni_labpc_cs.c
- drivers/staging/comedi/drivers/ni_mio_cs.c
- drivers/staging/comedi/drivers/quatech_daqp_cs.c
- drivers/staging/netwave/netwave_cs.c
- drivers/staging/wavelan/wavelan_cs.c
- drivers/staging/wlags49_h2/wl_cs.c
- drivers/telephony/ixj_pcmcia.c
- drivers/usb/host/sl811_cs.c
- include/pcmcia/cs.h
- include/pcmcia/ds.h
- include/pcmcia/mem_op.h
- include/pcmcia/ss.h
- sound/pcmcia/pdaudiocf/pdaudiocf.c
- sound/pcmcia/pdaudiocf/pdaudiocf.h
- sound/pcmcia/vx/vxpocket.c
- sound/pcmcia/vx/vxpocket.h