diff options
-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/com20020_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/netwave_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 1 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 1 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/sym53c500_cs.c | 1 |
9 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 794cc61819dd..448bf4a78016 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->conf.Attributes = CONF_ENABLE_IRQ; | 281 | link->conf.Attributes = CONF_ENABLE_IRQ; |
282 | link->conf.IntType = INT_MEMORY_AND_IO; | 282 | link->conf.IntType = INT_MEMORY_AND_IO; |
283 | link->conf.ConfigIndex = 1; | 283 | link->conf.ConfigIndex = 1; |
284 | link->conf.Present = PRESENT_OPTION; | ||
285 | 284 | ||
286 | /* The EL3-specific entries in the device structure. */ | 285 | /* The EL3-specific entries in the device structure. */ |
287 | dev->hard_start_xmit = &el3_start_xmit; | 286 | dev->hard_start_xmit = &el3_start_xmit; |
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 1e73ff7d5d8e..342f4062de0b 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
@@ -195,7 +195,6 @@ static int tc589_probe(struct pcmcia_device *link) | |||
195 | link->conf.Attributes = CONF_ENABLE_IRQ; | 195 | link->conf.Attributes = CONF_ENABLE_IRQ; |
196 | link->conf.IntType = INT_MEMORY_AND_IO; | 196 | link->conf.IntType = INT_MEMORY_AND_IO; |
197 | link->conf.ConfigIndex = 1; | 197 | link->conf.ConfigIndex = 1; |
198 | link->conf.Present = PRESENT_OPTION; | ||
199 | 198 | ||
200 | /* The EL3-specific entries in the device structure. */ | 199 | /* The EL3-specific entries in the device structure. */ |
201 | SET_MODULE_OWNER(dev); | 200 | SET_MODULE_OWNER(dev); |
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 91f65e91cd5f..0d1c7a41c9c6 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c | |||
@@ -173,7 +173,6 @@ static int com20020_probe(struct pcmcia_device *p_dev) | |||
173 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; | 173 | p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; |
174 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 174 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
175 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 175 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
176 | p_dev->conf.Present = PRESENT_OPTION; | ||
177 | 176 | ||
178 | p_dev->irq.Instance = info->dev = dev; | 177 | p_dev->irq.Instance = info->dev = dev; |
179 | p_dev->priv = info; | 178 | p_dev->priv = info; |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index 8478dca3d8d1..5879e7c36988 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -576,7 +576,6 @@ xirc2ps_probe(struct pcmcia_device *link) | |||
576 | link->conf.Attributes = CONF_ENABLE_IRQ; | 576 | link->conf.Attributes = CONF_ENABLE_IRQ; |
577 | link->conf.IntType = INT_MEMORY_AND_IO; | 577 | link->conf.IntType = INT_MEMORY_AND_IO; |
578 | link->conf.ConfigIndex = 1; | 578 | link->conf.ConfigIndex = 1; |
579 | link->conf.Present = PRESENT_OPTION; | ||
580 | link->irq.Handler = xirc2ps_interrupt; | 579 | link->irq.Handler = xirc2ps_interrupt; |
581 | link->irq.Instance = dev; | 580 | link->irq.Instance = dev; |
582 | 581 | ||
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index 644b4741ef74..a009ab517710 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
@@ -406,7 +406,6 @@ static int netwave_probe(struct pcmcia_device *link) | |||
406 | link->conf.Attributes = CONF_ENABLE_IRQ; | 406 | link->conf.Attributes = CONF_ENABLE_IRQ; |
407 | link->conf.IntType = INT_MEMORY_AND_IO; | 407 | link->conf.IntType = INT_MEMORY_AND_IO; |
408 | link->conf.ConfigIndex = 1; | 408 | link->conf.ConfigIndex = 1; |
409 | link->conf.Present = PRESENT_OPTION; | ||
410 | 409 | ||
411 | /* Netwave private struct init. link/dev/node already taken care of, | 410 | /* Netwave private struct init. link/dev/node already taken care of, |
412 | * other stuff zero'd - Jean II */ | 411 | * other stuff zero'd - Jean II */ |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 88e10c9bc4ac..47b2ccb6a633 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -331,7 +331,6 @@ static int ray_probe(struct pcmcia_device *p_dev) | |||
331 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 331 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
332 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 332 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
333 | p_dev->conf.ConfigIndex = 1; | 333 | p_dev->conf.ConfigIndex = 1; |
334 | p_dev->conf.Present = PRESENT_OPTION; | ||
335 | 334 | ||
336 | p_dev->priv = dev; | 335 | p_dev->priv = dev; |
337 | p_dev->irq.Instance = dev; | 336 | p_dev->irq.Instance = dev; |
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 583e0d655a98..c250f08c8dd5 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -1928,7 +1928,6 @@ static int wl3501_probe(struct pcmcia_device *p_dev) | |||
1928 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 1928 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
1929 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 1929 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
1930 | p_dev->conf.ConfigIndex = 1; | 1930 | p_dev->conf.ConfigIndex = 1; |
1931 | p_dev->conf.Present = PRESENT_OPTION; | ||
1932 | 1931 | ||
1933 | dev = alloc_etherdev(sizeof(struct wl3501_card)); | 1932 | dev = alloc_etherdev(sizeof(struct wl3501_card)); |
1934 | if (!dev) | 1933 | if (!dev) |
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index d72df5dae4ee..e16fe361436e 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -1629,7 +1629,6 @@ static int nsp_cs_probe(struct pcmcia_device *link) | |||
1629 | /* General socket configuration */ | 1629 | /* General socket configuration */ |
1630 | link->conf.Attributes = CONF_ENABLE_IRQ; | 1630 | link->conf.Attributes = CONF_ENABLE_IRQ; |
1631 | link->conf.IntType = INT_MEMORY_AND_IO; | 1631 | link->conf.IntType = INT_MEMORY_AND_IO; |
1632 | link->conf.Present = PRESENT_OPTION; | ||
1633 | 1632 | ||
1634 | ret = nsp_cs_config(link); | 1633 | ret = nsp_cs_config(link); |
1635 | 1634 | ||
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index fb7acea60286..9fb0ea5c1fb9 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c | |||
@@ -895,7 +895,6 @@ SYM53C500_probe(struct pcmcia_device *link) | |||
895 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; | 895 | link->irq.IRQInfo1 = IRQ_LEVEL_ID; |
896 | link->conf.Attributes = CONF_ENABLE_IRQ; | 896 | link->conf.Attributes = CONF_ENABLE_IRQ; |
897 | link->conf.IntType = INT_MEMORY_AND_IO; | 897 | link->conf.IntType = INT_MEMORY_AND_IO; |
898 | link->conf.Present = PRESENT_OPTION; | ||
899 | 898 | ||
900 | return SYM53C500_config(link); | 899 | return SYM53C500_config(link); |
901 | } /* SYM53C500_attach */ | 900 | } /* SYM53C500_attach */ |