diff options
Diffstat (limited to 'drivers/pcmcia/ds.c')
-rw-r--r-- | drivers/pcmcia/ds.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 00db60053f93..dd43bd33a9e3 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/dma-mapping.h> | 26 | #include <linux/dma-mapping.h> |
27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
28 | 28 | ||
29 | #include <pcmcia/cs.h> | ||
30 | #include <pcmcia/cistpl.h> | 29 | #include <pcmcia/cistpl.h> |
31 | #include <pcmcia/ds.h> | 30 | #include <pcmcia/ds.h> |
32 | #include <pcmcia/ss.h> | 31 | #include <pcmcia/ss.h> |
@@ -1178,7 +1177,7 @@ static int pcmcia_dev_resume(struct device *dev) | |||
1178 | 1177 | ||
1179 | if (p_dev->device_no == p_dev->func) { | 1178 | if (p_dev->device_no == p_dev->func) { |
1180 | dev_dbg(dev, "requesting configuration\n"); | 1179 | dev_dbg(dev, "requesting configuration\n"); |
1181 | ret = pcmcia_request_configuration(p_dev, &p_dev->conf); | 1180 | ret = pcmcia_enable_device(p_dev); |
1182 | if (ret) | 1181 | if (ret) |
1183 | goto out; | 1182 | goto out; |
1184 | } | 1183 | } |