aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/hardware/avm/avm_cs.c4
-rw-r--r--drivers/isdn/hisax/avma1_cs.c4
-rw-r--r--drivers/isdn/hisax/elsa_cs.c2
-rw-r--r--drivers/isdn/hisax/sedlbauer_cs.c2
-rw-r--r--drivers/isdn/hisax/teles_cs.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c
index 938ca4155c3b..2d8bbbf286aa 100644
--- a/drivers/isdn/hardware/avm/avm_cs.c
+++ b/drivers/isdn/hardware/avm/avm_cs.c
@@ -80,8 +80,8 @@ 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.ConfigIndex = 1; 83 p_dev->config_index = 1;
84 p_dev->conf.Present = PRESENT_OPTION; 84 p_dev->config_regs = PRESENT_OPTION;
85 85
86 return avmcs_config(p_dev); 86 return avmcs_config(p_dev);
87} /* avmcs_attach */ 87} /* avmcs_attach */
diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c
index 7d5ff20b5d5b..e25f6c7376ed 100644
--- a/drivers/isdn/hisax/avma1_cs.c
+++ b/drivers/isdn/hisax/avma1_cs.c
@@ -85,8 +85,8 @@ 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.ConfigIndex = 1; 88 p_dev->config_index = 1;
89 p_dev->conf.Present = PRESENT_OPTION; 89 p_dev->config_regs = PRESENT_OPTION;
90 90
91 return avma1cs_config(p_dev); 91 return avma1cs_config(p_dev);
92} /* avma1cs_attach */ 92} /* avma1cs_attach */
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index df360c8b31cb..f276e8428960 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -211,7 +211,7 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link)
211 211
212 /* Finally, report what we've done */ 212 /* Finally, report what we've done */
213 dev_info(&link->dev, "index 0x%02x: ", 213 dev_info(&link->dev, "index 0x%02x: ",
214 link->conf.ConfigIndex); 214 link->config_index);
215 if (link->conf.Attributes & CONF_ENABLE_IRQ) 215 if (link->conf.Attributes & CONF_ENABLE_IRQ)
216 printk(", irq %d", link->irq); 216 printk(", irq %d", link->irq);
217 if (link->resource[0]) 217 if (link->resource[0])
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c
index 169061fbca98..43d0a4e97ead 100644
--- a/drivers/isdn/hisax/sedlbauer_cs.c
+++ b/drivers/isdn/hisax/sedlbauer_cs.c
@@ -253,7 +253,7 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link)
253 253
254 /* Finally, report what we've done */ 254 /* Finally, report what we've done */
255 dev_info(&link->dev, "index 0x%02x:", 255 dev_info(&link->dev, "index 0x%02x:",
256 link->conf.ConfigIndex); 256 link->config_index);
257 if (link->vpp) 257 if (link->vpp)
258 printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); 258 printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
259 if (link->conf.Attributes & CONF_ENABLE_IRQ) 259 if (link->conf.Attributes & CONF_ENABLE_IRQ)
diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c
index 46e72a1eed2d..614afc64b5b1 100644
--- a/drivers/isdn/hisax/teles_cs.c
+++ b/drivers/isdn/hisax/teles_cs.c
@@ -191,7 +191,7 @@ static int __devinit teles_cs_config(struct pcmcia_device *link)
191 191
192 /* Finally, report what we've done */ 192 /* Finally, report what we've done */
193 dev_info(&link->dev, "index 0x%02x:", 193 dev_info(&link->dev, "index 0x%02x:",
194 link->conf.ConfigIndex); 194 link->config_index);
195 if (link->conf.Attributes & CONF_ENABLE_IRQ) 195 if (link->conf.Attributes & CONF_ENABLE_IRQ)
196 printk(", irq %d", link->irq); 196 printk(", irq %d", link->irq);
197 if (link->resource[0]) 197 if (link->resource[0])