diff options
Diffstat (limited to 'drivers/scsi/pcmcia')
-rw-r--r-- | drivers/scsi/pcmcia/aha152x_stub.c | 2 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/fdomain_stub.c | 2 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 2 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c index 3c0046e89f37..c3682492af16 100644 --- a/drivers/scsi/pcmcia/aha152x_stub.c +++ b/drivers/scsi/pcmcia/aha152x_stub.c | |||
@@ -103,7 +103,7 @@ 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.Present = PRESENT_OPTION; | 106 | link->config_regs = PRESENT_OPTION; |
107 | 107 | ||
108 | return aha152x_config_cs(link); | 108 | return aha152x_config_cs(link); |
109 | } /* aha152x_attach */ | 109 | } /* aha152x_attach */ |
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index 8ff760380d88..bb909e1b7c68 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c | |||
@@ -86,7 +86,7 @@ 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.Present = PRESENT_OPTION; | 89 | link->config_regs = PRESENT_OPTION; |
90 | 90 | ||
91 | return fdomain_config(link); | 91 | return fdomain_config(link); |
92 | } /* fdomain_attach */ | 92 | } /* fdomain_attach */ |
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index c0cf2dfd6fbc..a5648e9c4f6e 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -1745,7 +1745,7 @@ static int nsp_cs_config(struct pcmcia_device *link) | |||
1745 | 1745 | ||
1746 | /* Finally, report what we've done */ | 1746 | /* Finally, report what we've done */ |
1747 | printk(KERN_INFO "nsp_cs: index 0x%02x: ", | 1747 | printk(KERN_INFO "nsp_cs: index 0x%02x: ", |
1748 | link->conf.ConfigIndex); | 1748 | link->config_index); |
1749 | if (link->vpp) { | 1749 | if (link->vpp) { |
1750 | printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); | 1750 | printk(", Vpp %d.%d", link->vpp/10, link->vpp%10); |
1751 | } | 1751 | } |
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 77f46a279d6b..5e2cbe091408 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c | |||
@@ -159,7 +159,7 @@ 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.Present = PRESENT_OPTION; | 162 | link->config_regs = PRESENT_OPTION; |
163 | 163 | ||
164 | return qlogic_config(link); | 164 | return qlogic_config(link); |
165 | } /* qlogic_attach */ | 165 | } /* qlogic_attach */ |