diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/comedi/drivers/cb_das16_cs.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/das08_cs.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_dio24.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_cs.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/ni_mio_cs.c | 1 | ||||
-rw-r--r-- | drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_cs.c | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index f8ede1182cc..11271b61f65 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 48d9fb1227d..319aad48ec2 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 8cf56cb0a3f..d269bbdf5cf 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 ba693435963..fcaa82967b9 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 5d5f11f2b5c..a936c11e7dc 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 1f2426352eb..be7e021e576 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 bf489d7f499..cd818fbd918 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 19c33545865..b2efff692ad 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 | ||