aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/pata_pcmcia.c1
-rw-r--r--drivers/bluetooth/bluecard_cs.c1
-rw-r--r--drivers/bluetooth/bt3c_cs.c1
-rw-r--r--drivers/bluetooth/btuart_cs.c1
-rw-r--r--drivers/bluetooth/dtl1_cs.c1
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c3
-rw-r--r--drivers/char/pcmcia/cm4040_cs.c3
-rw-r--r--drivers/char/pcmcia/ipwireless/main.c1
-rw-r--r--drivers/char/pcmcia/synclink_cs.c2
-rw-r--r--drivers/ide/ide-cs.c1
-rw-r--r--drivers/isdn/hardware/avm/avm_cs.c1
-rw-r--r--drivers/isdn/hisax/avma1_cs.c1
-rw-r--r--drivers/isdn/hisax/elsa_cs.c1
-rw-r--r--drivers/isdn/hisax/sedlbauer_cs.c1
-rw-r--r--drivers/isdn/hisax/teles_cs.c1
-rw-r--r--drivers/mtd/maps/pcmciamtd.c2
-rw-r--r--drivers/net/pcmcia/3c574_cs.c1
-rw-r--r--drivers/net/pcmcia/3c589_cs.c1
-rw-r--r--drivers/net/pcmcia/axnet_cs.c1
-rw-r--r--drivers/net/pcmcia/com20020_cs.c1
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c1
-rw-r--r--drivers/net/pcmcia/ibmtr_cs.c1
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c1
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c1
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c1
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c1
-rw-r--r--drivers/net/wireless/airo_cs.c1
-rw-r--r--drivers/net/wireless/atmel_cs.c1
-rw-r--r--drivers/net/wireless/b43/pcmcia.c1
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c1
-rw-r--r--drivers/net/wireless/libertas/if_cs.c1
-rw-r--r--drivers/net/wireless/orinoco/orinoco_cs.c1
-rw-r--r--drivers/net/wireless/orinoco/spectrum_cs.c1
-rw-r--r--drivers/net/wireless/ray_cs.c1
-rw-r--r--drivers/net/wireless/wl3501_cs.c1
-rw-r--r--drivers/parport/parport_cs.c1
-rw-r--r--drivers/pcmcia/cs_internal.h1
-rw-r--r--drivers/pcmcia/pcmcia_resource.c10
-rw-r--r--drivers/scsi/pcmcia/aha152x_stub.c1
-rw-r--r--drivers/scsi/pcmcia/fdomain_stub.c1
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c1
-rw-r--r--drivers/scsi/pcmcia/qlogic_stub.c1
-rw-r--r--drivers/scsi/pcmcia/sym53c500_cs.c1
-rw-r--r--drivers/serial/serial_cs.c2
-rw-r--r--drivers/staging/comedi/drivers/cb_das16_cs.c1
-rw-r--r--drivers/staging/comedi/drivers/das08_cs.c1
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_700.c1
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_dio24.c1
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc_cs.c1
-rw-r--r--drivers/staging/comedi/drivers/ni_mio_cs.c1
-rw-r--r--drivers/staging/comedi/drivers/quatech_daqp_cs.c1
-rw-r--r--drivers/staging/wlags49_h2/wl_cs.c1
-rw-r--r--drivers/telephony/ixj_pcmcia.c1
-rw-r--r--drivers/usb/host/sl811_cs.c1
-rw-r--r--include/pcmcia/cs.h7
-rw-r--r--sound/pcmcia/pdaudiocf/pdaudiocf.c1
-rw-r--r--sound/pcmcia/vx/vxpocket.c1
57 files changed, 1 insertions, 78 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 12cdc9ff39ad..c2679c01188b 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -250,7 +250,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
250 pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 250 pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
251 pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; 251 pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
252 pdev->conf.Attributes = CONF_ENABLE_IRQ; 252 pdev->conf.Attributes = CONF_ENABLE_IRQ;
253 pdev->conf.IntType = INT_MEMORY_AND_IO;
254 253
255 /* See if we have a manufacturer identifier. Use it to set is_kme for 254 /* See if we have a manufacturer identifier. Use it to set is_kme for
256 vendor quirks */ 255 vendor quirks */
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index d52e90a5a617..4cb2dfebde80 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -866,7 +866,6 @@ static int bluecard_probe(struct pcmcia_device *link)
866 link->priv = info; 866 link->priv = info;
867 867
868 link->conf.Attributes = CONF_ENABLE_IRQ; 868 link->conf.Attributes = CONF_ENABLE_IRQ;
869 link->conf.IntType = INT_MEMORY_AND_IO;
870 869
871 return bluecard_config(link); 870 return bluecard_config(link);
872} 871}
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 2c8d981c110d..fb018073a5f8 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -661,7 +661,6 @@ static int bt3c_probe(struct pcmcia_device *link)
661 link->resource[0]->end = 8; 661 link->resource[0]->end = 8;
662 662
663 link->conf.Attributes = CONF_ENABLE_IRQ; 663 link->conf.Attributes = CONF_ENABLE_IRQ;
664 link->conf.IntType = INT_MEMORY_AND_IO;
665 664
666 return bt3c_config(link); 665 return bt3c_config(link);
667} 666}
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 7ea6fa42fdef..897c7c74ca14 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -590,7 +590,6 @@ static int btuart_probe(struct pcmcia_device *link)
590 link->resource[0]->end = 8; 590 link->resource[0]->end = 8;
591 591
592 link->conf.Attributes = CONF_ENABLE_IRQ; 592 link->conf.Attributes = CONF_ENABLE_IRQ;
593 link->conf.IntType = INT_MEMORY_AND_IO;
594 593
595 return btuart_config(link); 594 return btuart_config(link);
596} 595}
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index db7c8db695fc..b4c9a2e0a96b 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -576,7 +576,6 @@ static int dtl1_probe(struct pcmcia_device *link)
576 link->resource[0]->end = 8; 576 link->resource[0]->end = 8;
577 577
578 link->conf.Attributes = CONF_ENABLE_IRQ; 578 link->conf.Attributes = CONF_ENABLE_IRQ;
579 link->conf.IntType = INT_MEMORY_AND_IO;
580 579
581 return dtl1_config(link); 580 return dtl1_config(link);
582} 581}
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index ec73d9f6d9ed..d2accd64b3f5 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1767,8 +1767,6 @@ static int cm4000_config(struct pcmcia_device * link, int devno)
1767 if (pcmcia_loop_config(link, cm4000_config_check, NULL)) 1767 if (pcmcia_loop_config(link, cm4000_config_check, NULL))
1768 goto cs_release; 1768 goto cs_release;
1769 1769
1770 link->conf.IntType = 00000002;
1771
1772 if (pcmcia_request_configuration(link, &link->conf)) 1770 if (pcmcia_request_configuration(link, &link->conf))
1773 goto cs_release; 1771 goto cs_release;
1774 1772
@@ -1829,7 +1827,6 @@ static int cm4000_probe(struct pcmcia_device *link)
1829 1827
1830 dev->p_dev = link; 1828 dev->p_dev = link;
1831 link->priv = dev; 1829 link->priv = dev;
1832 link->conf.IntType = INT_MEMORY_AND_IO;
1833 dev_table[i] = link; 1830 dev_table[i] = link;
1834 1831
1835 init_waitqueue_head(&dev->devq); 1832 init_waitqueue_head(&dev->devq);
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 815cde1d0570..a32eba0afdfc 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -547,8 +547,6 @@ static int reader_config(struct pcmcia_device *link, int devno)
547 if (pcmcia_loop_config(link, cm4040_config_check, NULL)) 547 if (pcmcia_loop_config(link, cm4040_config_check, NULL))
548 goto cs_release; 548 goto cs_release;
549 549
550 link->conf.IntType = 00000002;
551
552 fail_rc = pcmcia_request_configuration(link, &link->conf); 550 fail_rc = pcmcia_request_configuration(link, &link->conf);
553 if (fail_rc != 0) { 551 if (fail_rc != 0) {
554 dev_printk(KERN_INFO, &link->dev, 552 dev_printk(KERN_INFO, &link->dev,
@@ -599,7 +597,6 @@ static int reader_probe(struct pcmcia_device *link)
599 link->priv = dev; 597 link->priv = dev;
600 dev->p_dev = link; 598 dev->p_dev = link;
601 599
602 link->conf.IntType = INT_MEMORY_AND_IO;
603 dev_table[i] = link; 600 dev_table[i] = link;
604 601
605 init_waitqueue_head(&dev->devq); 602 init_waitqueue_head(&dev->devq);
diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c
index 8d2b86aab715..0f0be4df7b7c 100644
--- a/drivers/char/pcmcia/ipwireless/main.c
+++ b/drivers/char/pcmcia/ipwireless/main.c
@@ -173,7 +173,6 @@ static int config_ipwireless(struct ipw_dev *ipw)
173 return ret; 173 return ret;
174 174
175 link->conf.Attributes = CONF_ENABLE_IRQ; 175 link->conf.Attributes = CONF_ENABLE_IRQ;
176 link->conf.IntType = INT_MEMORY_AND_IO;
177 176
178 INIT_WORK(&ipw->work_reboot, signalled_reboot_work); 177 INIT_WORK(&ipw->work_reboot, signalled_reboot_work);
179 178
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 9ecd6bef5d3b..ba7ccf5701ed 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -551,7 +551,6 @@ static int mgslpc_probe(struct pcmcia_device *link)
551 /* Initialize the struct pcmcia_device structure */ 551 /* Initialize the struct pcmcia_device structure */
552 552
553 link->conf.Attributes = 0; 553 link->conf.Attributes = 0;
554 link->conf.IntType = INT_MEMORY_AND_IO;
555 554
556 ret = mgslpc_config(link); 555 ret = mgslpc_config(link);
557 if (ret) 556 if (ret)
@@ -595,7 +594,6 @@ static int mgslpc_config(struct pcmcia_device *link)
595 goto failed; 594 goto failed;
596 595
597 link->conf.Attributes = CONF_ENABLE_IRQ; 596 link->conf.Attributes = CONF_ENABLE_IRQ;
598 link->conf.IntType = INT_MEMORY_AND_IO;
599 link->conf.ConfigIndex = 8; 597 link->conf.ConfigIndex = 8;
600 link->conf.Present = PRESENT_OPTION; 598 link->conf.Present = PRESENT_OPTION;
601 599
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 82690e409435..cf7cb4953aa5 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -100,7 +100,6 @@ static int ide_probe(struct pcmcia_device *link)
100 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 100 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
101 link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; 101 link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
102 link->conf.Attributes = CONF_ENABLE_IRQ; 102 link->conf.Attributes = CONF_ENABLE_IRQ;
103 link->conf.IntType = INT_MEMORY_AND_IO;
104 103
105 return ide_config(link); 104 return ide_config(link);
106} /* ide_attach */ 105} /* ide_attach */
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 09b1795516f4..938ca4155c3b 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -80,7 +80,6 @@ static int avmcs_probe(struct pcmcia_device *p_dev)
80 80
81 /* General socket configuration */ 81 /* General socket configuration */
82 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 82 p_dev->conf.Attributes = CONF_ENABLE_IRQ;
83 p_dev->conf.IntType = INT_MEMORY_AND_IO;
84 p_dev->conf.ConfigIndex = 1; 83 p_dev->conf.ConfigIndex = 1;
85 p_dev->conf.Present = PRESENT_OPTION; 84 p_dev->conf.Present = PRESENT_OPTION;
86 85
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 94263c22b874..7d5ff20b5d5b 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -85,7 +85,6 @@ static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)
85 85
86 /* General socket configuration */ 86 /* General socket configuration */
87 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 87 p_dev->conf.Attributes = CONF_ENABLE_IRQ;
88 p_dev->conf.IntType = INT_MEMORY_AND_IO;
89 p_dev->conf.ConfigIndex = 1; 88 p_dev->conf.ConfigIndex = 1;
90 p_dev->conf.Present = PRESENT_OPTION; 89 p_dev->conf.Present = PRESENT_OPTION;
91 90
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index b3c08aaf41c4..df360c8b31cb 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -130,7 +130,6 @@ static int __devinit elsa_cs_probe(struct pcmcia_device *link)
130 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 130 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
131 131
132 link->conf.Attributes = CONF_ENABLE_IRQ; 132 link->conf.Attributes = CONF_ENABLE_IRQ;
133 link->conf.IntType = INT_MEMORY_AND_IO;
134 133
135 return elsa_cs_config(link); 134 return elsa_cs_config(link);
136} /* elsa_cs_attach */ 135} /* elsa_cs_attach */
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 40001ad9f614..169061fbca98 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -133,7 +133,6 @@ static int __devinit sedlbauer_probe(struct pcmcia_device *link)
133 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; 133 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
134 134
135 link->conf.Attributes = 0; 135 link->conf.Attributes = 0;
136 link->conf.IntType = INT_MEMORY_AND_IO;
137 136
138 return sedlbauer_config(link); 137 return sedlbauer_config(link);
139} /* sedlbauer_attach */ 138} /* sedlbauer_attach */
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 7296102ca255..46e72a1eed2d 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -110,7 +110,6 @@ static int __devinit teles_probe(struct pcmcia_device *link)
110 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 110 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
111 111
112 link->conf.Attributes = CONF_ENABLE_IRQ; 112 link->conf.Attributes = CONF_ENABLE_IRQ;
113 link->conf.IntType = INT_MEMORY_AND_IO;
114 113
115 return teles_cs_config(link); 114 return teles_cs_config(link);
116} /* teles_attach */ 115} /* teles_attach */
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index ab94c8aebddc..663b48bc657c 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -575,7 +575,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
575 link->vpp = 0; 575 link->vpp = 0;
576 } 576 }
577 577
578 link->conf.IntType = INT_MEMORY;
579 link->conf.ConfigIndex = 0; 578 link->conf.ConfigIndex = 0;
580 DEBUG(2, "Setting Configuration"); 579 DEBUG(2, "Setting Configuration");
581 ret = pcmcia_request_configuration(link, &link->conf); 580 ret = pcmcia_request_configuration(link, &link->conf);
@@ -720,7 +719,6 @@ static int pcmciamtd_probe(struct pcmcia_device *link)
720 link->priv = dev; 719 link->priv = dev;
721 720
722 link->conf.Attributes = 0; 721 link->conf.Attributes = 0;
723 link->conf.IntType = INT_MEMORY;
724 722
725 return pcmciamtd_config(link); 723 return pcmciamtd_config(link);
726} 724}
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index c683f77c6f42..41ecb2728a20 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -281,7 +281,6 @@ static int tc574_probe(struct pcmcia_device *link)
281 link->resource[0]->end = 32; 281 link->resource[0]->end = 32;
282 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16; 282 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
283 link->conf.Attributes = CONF_ENABLE_IRQ; 283 link->conf.Attributes = CONF_ENABLE_IRQ;
284 link->conf.IntType = INT_MEMORY_AND_IO;
285 link->conf.ConfigIndex = 1; 284 link->conf.ConfigIndex = 1;
286 285
287 dev->netdev_ops = &el3_netdev_ops; 286 dev->netdev_ops = &el3_netdev_ops;
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 61f9cf2100ff..68886729375d 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -217,7 +217,6 @@ static int tc589_probe(struct pcmcia_device *link)
217 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16; 217 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
218 218
219 link->conf.Attributes = CONF_ENABLE_IRQ; 219 link->conf.Attributes = CONF_ENABLE_IRQ;
220 link->conf.IntType = INT_MEMORY_AND_IO;
221 link->conf.ConfigIndex = 1; 220 link->conf.ConfigIndex = 1;
222 221
223 dev->netdev_ops = &el3_netdev_ops; 222 dev->netdev_ops = &el3_netdev_ops;
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 8734ed8f174d..4d4928a22b1f 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -167,7 +167,6 @@ static int axnet_probe(struct pcmcia_device *link)
167 info->p_dev = link; 167 info->p_dev = link;
168 link->priv = dev; 168 link->priv = dev;
169 link->conf.Attributes = CONF_ENABLE_IRQ; 169 link->conf.Attributes = CONF_ENABLE_IRQ;
170 link->conf.IntType = INT_MEMORY_AND_IO;
171 170
172 dev->netdev_ops = &axnet_netdev_ops; 171 dev->netdev_ops = &axnet_netdev_ops;
173 172
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index 3c400cfa82ae..a58eafed42a5 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -161,7 +161,6 @@ static int com20020_probe(struct pcmcia_device *p_dev)
161 p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; 161 p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
162 p_dev->resource[0]->end = 16; 162 p_dev->resource[0]->end = 16;
163 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 163 p_dev->conf.Attributes = CONF_ENABLE_IRQ;
164 p_dev->conf.IntType = INT_MEMORY_AND_IO;
165 164
166 info->dev = dev; 165 info->dev = dev;
167 p_dev->priv = info; 166 p_dev->priv = info;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index dfd32842412e..caf2b2ef4e35 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -253,7 +253,6 @@ static int fmvj18x_probe(struct pcmcia_device *link)
253 253
254 /* General socket configuration */ 254 /* General socket configuration */
255 link->conf.Attributes = CONF_ENABLE_IRQ; 255 link->conf.Attributes = CONF_ENABLE_IRQ;
256 link->conf.IntType = INT_MEMORY_AND_IO;
257 256
258 dev->netdev_ops = &fjn_netdev_ops; 257 dev->netdev_ops = &fjn_netdev_ops;
259 dev->watchdog_timeo = TX_TIMEOUT; 258 dev->watchdog_timeo = TX_TIMEOUT;
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index dbdea7f5e423..1327f086d86b 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -153,7 +153,6 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link)
153 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; 153 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
154 link->resource[0]->end = 4; 154 link->resource[0]->end = 4;
155 link->conf.Attributes = CONF_ENABLE_IRQ; 155 link->conf.Attributes = CONF_ENABLE_IRQ;
156 link->conf.IntType = INT_MEMORY_AND_IO;
157 link->conf.Present = PRESENT_OPTION; 156 link->conf.Present = PRESENT_OPTION;
158 157
159 info->dev = dev; 158 info->dev = dev;
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 68f2deeb3ade..90d172804bfc 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -461,7 +461,6 @@ static int nmclan_probe(struct pcmcia_device *link)
461 link->resource[0]->end = 32; 461 link->resource[0]->end = 32;
462 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 462 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
463 link->conf.Attributes = CONF_ENABLE_IRQ; 463 link->conf.Attributes = CONF_ENABLE_IRQ;
464 link->conf.IntType = INT_MEMORY_AND_IO;
465 link->conf.ConfigIndex = 1; 464 link->conf.ConfigIndex = 1;
466 link->conf.Present = PRESENT_OPTION; 465 link->conf.Present = PRESENT_OPTION;
467 466
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index f3d7a149070a..69135761719a 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -261,7 +261,6 @@ static int pcnet_probe(struct pcmcia_device *link)
261 link->priv = dev; 261 link->priv = dev;
262 262
263 link->conf.Attributes = CONF_ENABLE_IRQ; 263 link->conf.Attributes = CONF_ENABLE_IRQ;
264 link->conf.IntType = INT_MEMORY_AND_IO;
265 264
266 dev->netdev_ops = &pcnet_netdev_ops; 265 dev->netdev_ops = &pcnet_netdev_ops;
267 266
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 2031a27253d1..2c2a8788c078 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -327,7 +327,6 @@ static int smc91c92_probe(struct pcmcia_device *link)
327 link->resource[0]->end = 16; 327 link->resource[0]->end = 16;
328 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 328 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
329 link->conf.Attributes = CONF_ENABLE_IRQ; 329 link->conf.Attributes = CONF_ENABLE_IRQ;
330 link->conf.IntType = INT_MEMORY_AND_IO;
331 330
332 /* The SMC91c92-specific entries in the device structure. */ 331 /* The SMC91c92-specific entries in the device structure. */
333 dev->netdev_ops = &smc_netdev_ops; 332 dev->netdev_ops = &smc_netdev_ops;
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 59398a6f1344..1776f49e0917 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -530,7 +530,6 @@ xirc2ps_probe(struct pcmcia_device *link)
530 530
531 /* General socket configuration */ 531 /* General socket configuration */
532 link->conf.Attributes = CONF_ENABLE_IRQ; 532 link->conf.Attributes = CONF_ENABLE_IRQ;
533 link->conf.IntType = INT_MEMORY_AND_IO;
534 link->conf.ConfigIndex = 1; 533 link->conf.ConfigIndex = 1;
535 534
536 /* Fill in card specific entries */ 535 /* Fill in card specific entries */
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index ab60f1084716..ccb2fdde002c 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -104,7 +104,6 @@ static int airo_probe(struct pcmcia_device *p_dev)
104 device, and can be hard-wired here. 104 device, and can be hard-wired here.
105 */ 105 */
106 p_dev->conf.Attributes = 0; 106 p_dev->conf.Attributes = 0;
107 p_dev->conf.IntType = INT_MEMORY_AND_IO;
108 107
109 /* Allocate space for private device-specific data */ 108 /* Allocate space for private device-specific data */
110 local = kzalloc(sizeof(local_info_t), GFP_KERNEL); 109 local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index d6d585cb992a..8b75158caed7 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -114,7 +114,6 @@ static int atmel_probe(struct pcmcia_device *p_dev)
114 device, and can be hard-wired here. 114 device, and can be hard-wired here.
115 */ 115 */
116 p_dev->conf.Attributes = 0; 116 p_dev->conf.Attributes = 0;
117 p_dev->conf.IntType = INT_MEMORY_AND_IO;
118 117
119 /* Allocate space for private device-specific data */ 118 /* Allocate space for private device-specific data */
120 local = kzalloc(sizeof(local_info_t), GFP_KERNEL); 119 local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index 618d9b5c1054..138b26fcc75c 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -73,7 +73,6 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
73 err = -ENODEV; 73 err = -ENODEV;
74 74
75 dev->conf.Attributes = CONF_ENABLE_IRQ; 75 dev->conf.Attributes = CONF_ENABLE_IRQ;
76 dev->conf.IntType = INT_MEMORY_AND_IO;
77 76
78 dev->resource[2]->flags |= WIN_ENABLE | WIN_DATA_WIDTH_16 | 77 dev->resource[2]->flags |= WIN_ENABLE | WIN_DATA_WIDTH_16 |
79 WIN_USE_WAIT; 78 WIN_USE_WAIT;
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 3fa285b1bdd3..0fe6f82cda58 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -437,7 +437,6 @@ static int hostap_cs_probe(struct pcmcia_device *p_dev)
437 int ret; 437 int ret;
438 438
439 PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info); 439 PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
440 p_dev->conf.IntType = INT_MEMORY_AND_IO;
441 440
442 ret = prism2_config(p_dev); 441 ret = prism2_config(p_dev);
443 if (ret) { 442 if (ret) {
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 9c298396be50..814b7faaa365 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -836,7 +836,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
836 p_dev->priv = card; 836 p_dev->priv = card;
837 837
838 p_dev->conf.Attributes = 0; 838 p_dev->conf.Attributes = 0;
839 p_dev->conf.IntType = INT_MEMORY_AND_IO;
840 839
841 if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) { 840 if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) {
842 lbs_pr_err("error in pcmcia_loop_config\n"); 841 lbs_pr_err("error in pcmcia_loop_config\n");
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index f7e3fa6305b4..1147d6bd4733 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -123,7 +123,6 @@ orinoco_cs_probe(struct pcmcia_device *link)
123 * number, sizes, and attributes of IO windows) are fixed by 123 * number, sizes, and attributes of IO windows) are fixed by
124 * the nature of the device, and can be hard-wired here. */ 124 * the nature of the device, and can be hard-wired here. */
125 link->conf.Attributes = 0; 125 link->conf.Attributes = 0;
126 link->conf.IntType = INT_MEMORY_AND_IO;
127 126
128 return orinoco_cs_config(link); 127 return orinoco_cs_config(link);
129} /* orinoco_cs_attach */ 128} /* orinoco_cs_attach */
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index 1bbad101b559..20b08ab87655 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -185,7 +185,6 @@ spectrum_cs_probe(struct pcmcia_device *link)
185 * number, sizes, and attributes of IO windows) are fixed by 185 * number, sizes, and attributes of IO windows) are fixed by
186 * the nature of the device, and can be hard-wired here. */ 186 * the nature of the device, and can be hard-wired here. */
187 link->conf.Attributes = 0; 187 link->conf.Attributes = 0;
188 link->conf.IntType = INT_MEMORY_AND_IO;
189 188
190 return spectrum_cs_config(link); 189 return spectrum_cs_config(link);
191} /* spectrum_cs_attach */ 190} /* spectrum_cs_attach */
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index ab34cb8c56c7..30cfd8890e34 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -319,7 +319,6 @@ static int ray_probe(struct pcmcia_device *p_dev)
319 319
320 /* General socket configuration */ 320 /* General socket configuration */
321 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 321 p_dev->conf.Attributes = CONF_ENABLE_IRQ;
322 p_dev->conf.IntType = INT_MEMORY_AND_IO;
323 p_dev->conf.ConfigIndex = 1; 322 p_dev->conf.ConfigIndex = 1;
324 323
325 p_dev->priv = dev; 324 p_dev->priv = dev;
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index a1cc2d498a1c..92a9ad575cc7 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1889,7 +1889,6 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
1889 1889
1890 /* General socket configuration */ 1890 /* General socket configuration */
1891 p_dev->conf.Attributes = CONF_ENABLE_IRQ; 1891 p_dev->conf.Attributes = CONF_ENABLE_IRQ;
1892 p_dev->conf.IntType = INT_MEMORY_AND_IO;
1893 p_dev->conf.ConfigIndex = 1; 1892 p_dev->conf.ConfigIndex = 1;
1894 1893
1895 dev = alloc_etherdev(sizeof(struct wl3501_card)); 1894 dev = alloc_etherdev(sizeof(struct wl3501_card));
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 23e50f4a27c5..afd946e15ee7 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -104,7 +104,6 @@ static int parport_probe(struct pcmcia_device *link)
104 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; 104 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
105 link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; 105 link->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
106 link->conf.Attributes = CONF_ENABLE_IRQ; 106 link->conf.Attributes = CONF_ENABLE_IRQ;
107 link->conf.IntType = INT_MEMORY_AND_IO;
108 107
109 return parport_config(link); 108 return parport_config(link);
110} /* parport_attach */ 109} /* parport_attach */
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 7ef464d40e91..a0c5adb37b5f 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -34,7 +34,6 @@ typedef struct config_t {
34 struct kref ref; 34 struct kref ref;
35 unsigned int state; 35 unsigned int state;
36 unsigned int Attributes; 36 unsigned int Attributes;
37 unsigned int IntType;
38 unsigned int ConfigBase; 37 unsigned int ConfigBase;
39 unsigned char Option; 38 unsigned char Option;
40 unsigned int CardValues; 39 unsigned int CardValues;
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 8834bb415d38..6210e1c2b432 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -447,11 +447,6 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
447 if (!(s->state & SOCKET_PRESENT)) 447 if (!(s->state & SOCKET_PRESENT))
448 return -ENODEV; 448 return -ENODEV;
449 449
450 if (req->IntType & INT_CARDBUS) {
451 dev_dbg(&p_dev->dev, "IntType may not be INT_CARDBUS\n");
452 return -EINVAL;
453 }
454
455 mutex_lock(&s->ops_mutex); 450 mutex_lock(&s->ops_mutex);
456 c = p_dev->function_config; 451 c = p_dev->function_config;
457 if (c->state & CONFIG_LOCKED) { 452 if (c->state & CONFIG_LOCKED) {
@@ -470,12 +465,9 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
470 } 465 }
471 466
472 /* Pick memory or I/O card, DMA mode, interrupt */ 467 /* Pick memory or I/O card, DMA mode, interrupt */
473 c->IntType = req->IntType;
474 c->Attributes = req->Attributes; 468 c->Attributes = req->Attributes;
475 if (req->IntType & INT_MEMORY_AND_IO) 469 if (p_dev->_io)
476 s->socket.flags |= SS_IOCARD; 470 s->socket.flags |= SS_IOCARD;
477 if (req->IntType & INT_ZOOMED_VIDEO)
478 s->socket.flags |= SS_ZVCARD | SS_IOCARD;
479 if (req->Attributes & CONF_ENABLE_DMA) 471 if (req->Attributes & CONF_ENABLE_DMA)
480 s->socket.flags |= SS_DMA_MODE; 472 s->socket.flags |= SS_DMA_MODE;
481 if (req->Attributes & CONF_ENABLE_SPKR) { 473 if (req->Attributes & CONF_ENABLE_SPKR) {
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 61f49bdcc0c2..3c0046e89f37 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -103,7 +103,6 @@ static int aha152x_probe(struct pcmcia_device *link)
103 link->resource[0]->end = 0x20; 103 link->resource[0]->end = 0x20;
104 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 104 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
105 link->conf.Attributes = CONF_ENABLE_IRQ; 105 link->conf.Attributes = CONF_ENABLE_IRQ;
106 link->conf.IntType = INT_MEMORY_AND_IO;
107 link->conf.Present = PRESENT_OPTION; 106 link->conf.Present = PRESENT_OPTION;
108 107
109 return aha152x_config_cs(link); 108 return aha152x_config_cs(link);
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index 13dbe5c48492..8ff760380d88 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -86,7 +86,6 @@ static int fdomain_probe(struct pcmcia_device *link)
86 link->resource[0]->end = 0x10; 86 link->resource[0]->end = 0x10;
87 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 87 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
88 link->conf.Attributes = CONF_ENABLE_IRQ; 88 link->conf.Attributes = CONF_ENABLE_IRQ;
89 link->conf.IntType = INT_MEMORY_AND_IO;
90 link->conf.Present = PRESENT_OPTION; 89 link->conf.Present = PRESENT_OPTION;
91 90
92 return fdomain_config(link); 91 return fdomain_config(link);
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index b90cade36746..c0cf2dfd6fbc 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1563,7 +1563,6 @@ static int nsp_cs_probe(struct pcmcia_device *link)
1563 1563
1564 /* General socket configuration */ 1564 /* General socket configuration */
1565 link->conf.Attributes = CONF_ENABLE_IRQ; 1565 link->conf.Attributes = CONF_ENABLE_IRQ;
1566 link->conf.IntType = INT_MEMORY_AND_IO;
1567 1566
1568 ret = nsp_cs_config(link); 1567 ret = nsp_cs_config(link);
1569 1568
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index eb775f1a523c..77f46a279d6b 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -159,7 +159,6 @@ static int qlogic_probe(struct pcmcia_device *link)
159 link->resource[0]->end = 16; 159 link->resource[0]->end = 16;
160 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 160 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
161 link->conf.Attributes = CONF_ENABLE_IRQ; 161 link->conf.Attributes = CONF_ENABLE_IRQ;
162 link->conf.IntType = INT_MEMORY_AND_IO;
163 link->conf.Present = PRESENT_OPTION; 162 link->conf.Present = PRESENT_OPTION;
164 163
165 return qlogic_config(link); 164 return qlogic_config(link);
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 321e390c9120..9aaf974d4d1c 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -862,7 +862,6 @@ SYM53C500_probe(struct pcmcia_device *link)
862 link->resource[0]->end = 16; 862 link->resource[0]->end = 16;
863 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; 863 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
864 link->conf.Attributes = CONF_ENABLE_IRQ; 864 link->conf.Attributes = CONF_ENABLE_IRQ;
865 link->conf.IntType = INT_MEMORY_AND_IO;
866 865
867 return SYM53C500_config(link); 866 return SYM53C500_config(link);
868} /* SYM53C500_attach */ 867} /* SYM53C500_attach */
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c
index 0460c0882b70..38baede2a770 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -337,8 +337,6 @@ static int serial_probe(struct pcmcia_device *link)
337 if (do_sound) 337 if (do_sound)
338 link->conf.Attributes |= CONF_ENABLE_SPKR; 338 link->conf.Attributes |= CONF_ENABLE_SPKR;
339 339
340 link->conf.IntType = INT_MEMORY_AND_IO;
341
342 return serial_config(link); 340 return serial_config(link);
343} 341}
344 342
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index f8ede1182ccc..11271b61f653 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -694,7 +694,6 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link)
694 694
695 /* Initialize the pcmcia_device structure */ 695 /* Initialize the pcmcia_device structure */
696 link->conf.Attributes = 0; 696 link->conf.Attributes = 0;
697 link->conf.IntType = INT_MEMORY_AND_IO;
698 697
699 cur_dev = link; 698 cur_dev = link;
700 699
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index 48d9fb1227df..319aad48ec2e 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -170,7 +170,6 @@ static int das08_pcmcia_attach(struct pcmcia_device *link)
170 device, and can be hard-wired here. 170 device, and can be hard-wired here.
171 */ 171 */
172 link->conf.Attributes = 0; 172 link->conf.Attributes = 0;
173 link->conf.IntType = INT_MEMORY_AND_IO;
174 173
175 cur_dev = link; 174 cur_dev = link;
176 175
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 8cf56cb0a3ff..d269bbdf5cfb 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -499,7 +499,6 @@ static int dio700_cs_attach(struct pcmcia_device *link)
499 device, and can be hard-wired here. 499 device, and can be hard-wired here.
500 */ 500 */
501 link->conf.Attributes = 0; 501 link->conf.Attributes = 0;
502 link->conf.IntType = INT_MEMORY_AND_IO;
503 502
504 pcmcia_cur_dev = link; 503 pcmcia_cur_dev = link;
505 504
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index ba693435963e..fcaa82967b92 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -251,7 +251,6 @@ static int dio24_cs_attach(struct pcmcia_device *link)
251 device, and can be hard-wired here. 251 device, and can be hard-wired here.
252 */ 252 */
253 link->conf.Attributes = 0; 253 link->conf.Attributes = 0;
254 link->conf.IntType = INT_MEMORY_AND_IO;
255 254
256 pcmcia_cur_dev = link; 255 pcmcia_cur_dev = link;
257 256
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 5d5f11f2b5c3..a936c11e7dc9 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -227,7 +227,6 @@ static int labpc_cs_attach(struct pcmcia_device *link)
227 device, and can be hard-wired here. 227 device, and can be hard-wired here.
228 */ 228 */
229 link->conf.Attributes = 0; 229 link->conf.Attributes = 0;
230 link->conf.IntType = INT_MEMORY_AND_IO;
231 230
232 pcmcia_cur_dev = link; 231 pcmcia_cur_dev = link;
233 232
diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c
index 1f2426352eb5..be7e021e576d 100644
--- a/drivers/staging/comedi/drivers/ni_mio_cs.c
+++ b/drivers/staging/comedi/drivers/ni_mio_cs.c
@@ -266,7 +266,6 @@ static int cs_attach(struct pcmcia_device *link)
266 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16; 266 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
267 link->resource[0]->end = 16; 267 link->resource[0]->end = 16;
268 link->conf.Attributes = CONF_ENABLE_IRQ; 268 link->conf.Attributes = CONF_ENABLE_IRQ;
269 link->conf.IntType = INT_MEMORY_AND_IO;
270 269
271 cur_dev = link; 270 cur_dev = link;
272 271
diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index bf489d7f4990..cd818fbd9185 100644
--- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -1039,7 +1039,6 @@ static int daqp_cs_attach(struct pcmcia_device *link)
1039 device, and can be hard-wired here. 1039 device, and can be hard-wired here.
1040 */ 1040 */
1041 link->conf.Attributes = 0; 1041 link->conf.Attributes = 0;
1042 link->conf.IntType = INT_MEMORY_AND_IO;
1043 1042
1044 daqp_cs_config(link); 1043 daqp_cs_config(link);
1045 1044
diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c
index 19c335458653..b2efff692ad5 100644
--- a/drivers/staging/wlags49_h2/wl_cs.c
+++ b/drivers/staging/wlags49_h2/wl_cs.c
@@ -148,7 +148,6 @@ static int wl_adapter_attach(struct pcmcia_device *link)
148 link->resource[0]->end = HCF_NUM_IO_PORTS; 148 link->resource[0]->end = HCF_NUM_IO_PORTS;
149 link->resource[0]->flags= IO_DATA_PATH_WIDTH_16; 149 link->resource[0]->flags= IO_DATA_PATH_WIDTH_16;
150 link->conf.Attributes = CONF_ENABLE_IRQ; 150 link->conf.Attributes = CONF_ENABLE_IRQ;
151 link->conf.IntType = INT_MEMORY_AND_IO;
152 link->conf.ConfigIndex = 5; 151 link->conf.ConfigIndex = 5;
153 link->conf.Present = PRESENT_OPTION; 152 link->conf.Present = PRESENT_OPTION;
154 153
diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index a1900e502518..5ccc6d0560a9 100644
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -34,7 +34,6 @@ static int ixj_probe(struct pcmcia_device *p_dev)
34 /* Create new ixj device */ 34 /* Create new ixj device */
35 p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; 35 p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
36 p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8; 36 p_dev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
37 p_dev->conf.IntType = INT_MEMORY_AND_IO;
38 p_dev->priv = kzalloc(sizeof(struct ixj_info_t), GFP_KERNEL); 37 p_dev->priv = kzalloc(sizeof(struct ixj_info_t), GFP_KERNEL);
39 if (!p_dev->priv) { 38 if (!p_dev->priv) {
40 return -ENOMEM; 39 return -ENOMEM;
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index 8e8475298baa..78bad5188144 100644
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -228,7 +228,6 @@ static int sl811_cs_probe(struct pcmcia_device *link)
228 link->priv = local; 228 link->priv = local;
229 229
230 link->conf.Attributes = 0; 230 link->conf.Attributes = 0;
231 link->conf.IntType = INT_MEMORY_AND_IO;
232 231
233 return sl811_cs_config(link); 232 return sl811_cs_config(link);
234} 233}
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 29d693f72ba9..674edbc9ebef 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -22,7 +22,6 @@
22/* For RequestConfiguration */ 22/* For RequestConfiguration */
23typedef struct config_req_t { 23typedef struct config_req_t {
24 u_int Attributes; 24 u_int Attributes;
25 u_int IntType;
26 u_int ConfigBase; 25 u_int ConfigBase;
27 u_char ConfigIndex; 26 u_char ConfigIndex;
28 u_int Present; 27 u_int Present;
@@ -36,12 +35,6 @@ typedef struct config_req_t {
36#define CONF_ENABLE_ESR 0x10 35#define CONF_ENABLE_ESR 0x10
37#define CONF_VALID_CLIENT 0x100 36#define CONF_VALID_CLIENT 0x100
38 37
39/* IntType field */
40#define INT_MEMORY 0x01
41#define INT_MEMORY_AND_IO 0x02
42#define INT_CARDBUS 0x04
43#define INT_ZOOMED_VIDEO 0x08
44
45/* Configuration registers present */ 38/* Configuration registers present */
46#define PRESENT_OPTION 0x001 39#define PRESENT_OPTION 0x001
47#define PRESENT_STATUS 0x002 40#define PRESENT_STATUS 0x002
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 7ab9174a8a84..2e1282de77d4 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -143,7 +143,6 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
143 link->resource[0]->end = 16; 143 link->resource[0]->end = 16;
144 144
145 link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ; 145 link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
146 link->conf.IntType = INT_MEMORY_AND_IO;
147 link->conf.ConfigIndex = 1; 146 link->conf.ConfigIndex = 1;
148 link->conf.Present = PRESENT_OPTION; 147 link->conf.Present = PRESENT_OPTION;
149 148
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index a6edfc3be29a..a48b3ee71377 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -163,7 +163,6 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl,
163 link->resource[0]->end = 16; 163 link->resource[0]->end = 16;
164 164
165 link->conf.Attributes = CONF_ENABLE_IRQ; 165 link->conf.Attributes = CONF_ENABLE_IRQ;
166 link->conf.IntType = INT_MEMORY_AND_IO;
167 link->conf.ConfigIndex = 1; 166 link->conf.ConfigIndex = 1;
168 link->conf.Present = PRESENT_OPTION; 167 link->conf.Present = PRESENT_OPTION;
169 168