diff options
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/com20020_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/fmvj18x_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/ibmtr_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/nmclan_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/smc91c92_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 1 |
10 files changed, 0 insertions, 10 deletions
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 */ |