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

1 files changed, 1 insertions, 18 deletions

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 75fa3530345b..57d8d0393567 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -85,6 +85,7 @@ typedef struct config_req_t {
 #define CONF_ENABLE_IRQ         0x01
 #define CONF_ENABLE_DMA         0x02
 #define CONF_ENABLE_SPKR        0x04
+#define CONF_ENABLE_PULSE_IRQ   0x08
 #define CONF_VALID_CLIENT       0x100
 
 /* IntType field */
@@ -113,25 +114,7 @@ typedef struct io_req_t {
 #define IO_DATA_PATH_WIDTH_16   0x08
 #define IO_DATA_PATH_WIDTH_AUTO 0x10
 
-/* For RequestIRQ and ReleaseIRQ */
-typedef struct irq_req_t {
-        u_int           Attributes;
-        u_int           AssignedIRQ;
-        irq_handler_t   Handler;
-} irq_req_t;
-
-/* Attributes for RequestIRQ and ReleaseIRQ */
-#define IRQ_TYPE                        0x03
-#define IRQ_TYPE_EXCLUSIVE              0x00
-#define IRQ_TYPE_TIME                   0x01
-#define IRQ_TYPE_DYNAMIC_SHARING        0x02
-#define IRQ_FORCED_PULSE                0x04
-#define IRQ_FIRST_SHARED                0x08 /* unused */
-#define IRQ_HANDLE_PRESENT              0x10 /* unused */
-#define IRQ_PULSE_ALLOCATED             0x100
-
 /* Bits in IRQInfo1 field */
-#define IRQ_MASK                0x0f
 #define IRQ_NMI_ID              0x01
 #define IRQ_IOCK_ID             0x02
 #define IRQ_BERR_ID             0x04