diff options
Diffstat (limited to 'drivers/scsi/pcmcia/fdomain_stub.c')
-rw-r--r-- | drivers/scsi/pcmcia/fdomain_stub.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index bb909e1b7c68..ae263b17bfa5 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <scsi/scsi_host.h> | 46 | #include <scsi/scsi_host.h> |
47 | #include "fdomain.h" | 47 | #include "fdomain.h" |
48 | 48 | ||
49 | #include <pcmcia/cs.h> | ||
50 | #include <pcmcia/cistpl.h> | 49 | #include <pcmcia/cistpl.h> |
51 | #include <pcmcia/ds.h> | 50 | #include <pcmcia/ds.h> |
52 | 51 | ||
@@ -85,7 +84,7 @@ static int fdomain_probe(struct pcmcia_device *link) | |||
85 | link->priv = info; | 84 | link->priv = info; |
86 | link->resource[0]->end = 0x10; | 85 | link->resource[0]->end = 0x10; |
87 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; | 86 | link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO; |
88 | link->conf.Attributes = CONF_ENABLE_IRQ; | 87 | link->config_flags |= CONF_ENABLE_IRQ; |
89 | link->config_regs = PRESENT_OPTION; | 88 | link->config_regs = PRESENT_OPTION; |
90 | 89 | ||
91 | return fdomain_config(link); | 90 | return fdomain_config(link); |
@@ -131,7 +130,7 @@ static int fdomain_config(struct pcmcia_device *link) | |||
131 | 130 | ||
132 | if (!link->irq) | 131 | if (!link->irq) |
133 | goto failed; | 132 | goto failed; |
134 | ret = pcmcia_request_configuration(link, &link->conf); | 133 | ret = pcmcia_enable_device(link); |
135 | if (ret) | 134 | if (ret) |
136 | goto failed; | 135 | goto failed; |
137 | 136 | ||