diff options
Diffstat (limited to 'drivers/mtd/maps/pcmciamtd.c')
-rw-r--r-- | drivers/mtd/maps/pcmciamtd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c index 99c7257363d6..388db9ecf222 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <asm/io.h> | 16 | #include <asm/io.h> |
17 | #include <asm/system.h> | 17 | #include <asm/system.h> |
18 | 18 | ||
19 | #include <pcmcia/cs.h> | ||
20 | #include <pcmcia/cistpl.h> | 19 | #include <pcmcia/cistpl.h> |
21 | #include <pcmcia/ds.h> | 20 | #include <pcmcia/ds.h> |
22 | 21 | ||
@@ -568,7 +567,6 @@ static int pcmciamtd_config(struct pcmcia_device *link) | |||
568 | dev->pcmcia_map.map_priv_2 = (unsigned long)link->resource[2]; | 567 | dev->pcmcia_map.map_priv_2 = (unsigned long)link->resource[2]; |
569 | 568 | ||
570 | dev->vpp = (vpp) ? vpp : link->socket->socket.Vpp; | 569 | dev->vpp = (vpp) ? vpp : link->socket->socket.Vpp; |
571 | link->conf.Attributes = 0; | ||
572 | if(setvpp == 2) { | 570 | if(setvpp == 2) { |
573 | link->vpp = dev->vpp; | 571 | link->vpp = dev->vpp; |
574 | } else { | 572 | } else { |
@@ -577,7 +575,7 @@ static int pcmciamtd_config(struct pcmcia_device *link) | |||
577 | 575 | ||
578 | link->config_index = 0; | 576 | link->config_index = 0; |
579 | DEBUG(2, "Setting Configuration"); | 577 | DEBUG(2, "Setting Configuration"); |
580 | ret = pcmcia_request_configuration(link, &link->conf); | 578 | ret = pcmcia_enable_device(link); |
581 | if (ret != 0) { | 579 | if (ret != 0) { |
582 | if (dev->win_base) { | 580 | if (dev->win_base) { |
583 | iounmap(dev->win_base); | 581 | iounmap(dev->win_base); |
@@ -718,8 +716,6 @@ static int pcmciamtd_probe(struct pcmcia_device *link) | |||
718 | dev->p_dev = link; | 716 | dev->p_dev = link; |
719 | link->priv = dev; | 717 | link->priv = dev; |
720 | 718 | ||
721 | link->conf.Attributes = 0; | ||
722 | |||
723 | return pcmciamtd_config(link); | 719 | return pcmciamtd_config(link); |
724 | } | 720 | } |
725 | 721 | ||