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)
  ...

diff --combined drivers/pcmcia/Kconfig
index a44733d44ca15a84268b8d7415a512ca21cedfcc,caca50eaa0e76281dfe77523c24da0a77d0c6215..d0f5ad306078f8714c2cd6739717b2f380d42ce1
--- 1/drivers/pcmcia/Kconfig
--- 2/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@@ -49,26 -49,6 +49,6 @@@ config PCMCIA_LOAD_CI
  
          If unsure, say Y.
  
- config PCMCIA_IOCTL
-       bool "PCMCIA control ioctl (obsolete)"
-       depends on PCMCIA && ARM && !SMP && !PREEMPT
-       default y
-       help
-         If you say Y here, the deprecated ioctl interface to the PCMCIA
-         subsystem will be built. It is needed by the deprecated pcmcia-cs
-         tools (cardmgr, cardctl) to function properly.
- 
-         You should use the new pcmciautils package instead (see
-         <file:Documentation/Changes> for location and details).
- 
-         This config option will most likely be removed from kernel 2.6.35,
-         the associated code from kernel 2.6.36.
- 
-         As the PCMCIA ioctl is not locking safe, it depends on !SMP and
-         !PREEMPT.
- 
-         If unsure, say N.
- 
  config CARDBUS
        bool "32-bit CardBus support"
        depends on PCI
@@@ -234,8 -214,7 +214,8 @@@ config PCMCIA_PXA2X
        depends on ARM && ARCH_PXA && PCMCIA
        depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \
                    || MACH_ARMCORE || ARCH_PXA_PALM || TRIZEPS_PCMCIA \
 -                  || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2)
 +                  || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
 +                  || MACH_VPAC270)
        select PCMCIA_SOC_COMMON
        help
          Say Y here to include support for the PXA2xx PCMCIA controller
@@@ -318,7 -297,7 +298,7 @@@ config ELECTRA_C
          PA Semi Electra eval board.
  
  config PCCARD_NONSTATIC
-       tristate
+       bool
  
  config PCCARD_IODYN
        bool

diff --combined drivers/pcmcia/Makefile
index 4dae3613c45863dc6d1cd884c7874fb50ea79f74,7031d0a4f4b0deec70c5fe1cc351d528d2698ec3..d006e8beab9c5eb60a8cbd580f720c42aa59ab4a
--- 1/drivers/pcmcia/Makefile
--- 2/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@@ -2,15 -2,18 +2,18 @@@
  # Makefile for the kernel pcmcia subsystem (c/o David Hinds)
  #
  
- pcmcia_core-y                                 += cs.o rsrc_mgr.o socket_sysfs.o
+ pcmcia_core-y                                 += cs.o socket_sysfs.o
  pcmcia_core-$(CONFIG_CARDBUS)                 += cardbus.o
  obj-$(CONFIG_PCCARD)                          += pcmcia_core.o
  
- pcmcia-y                                      += ds.o pcmcia_resource.o cistpl.o
+ pcmcia-y                                      += ds.o pcmcia_resource.o cistpl.o pcmcia_cis.o
  pcmcia-$(CONFIG_PCMCIA_IOCTL)                 += pcmcia_ioctl.o
  obj-$(CONFIG_PCMCIA)                          += pcmcia.o
  
- obj-$(CONFIG_PCCARD_NONSTATIC)                        += rsrc_nonstatic.o
+ pcmcia_rsrc-y                                 += rsrc_mgr.o
+ pcmcia_rsrc-$(CONFIG_PCCARD_NONSTATIC)                += rsrc_nonstatic.o
+ pcmcia_rsrc-$(CONFIG_PCCARD_IODYN)            += rsrc_iodyn.o
+ obj-$(CONFIG_PCCARD)                          += pcmcia_rsrc.o
  
  
  # socket drivers
@@@ -66,7 -69,6 +69,7 @@@ pxa2xx-obj-$(CONFIG_MACH_PALMTC)              += px
  pxa2xx-obj-$(CONFIG_MACH_PALMLD)              += pxa2xx_palmld.o
  pxa2xx-obj-$(CONFIG_MACH_E740)                        += pxa2xx_e740.o
  pxa2xx-obj-$(CONFIG_MACH_STARGATE2)           += pxa2xx_stargate2.o
 +pxa2xx-obj-$(CONFIG_MACH_VPAC270)             += pxa2xx_vpac270.o
  
  obj-$(CONFIG_PCMCIA_PXA2XX)                   += pxa2xx_base.o $(pxa2xx-obj-y)