aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-29 09:50:55 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-09-29 11:20:21 -0400
commite8405f0f617856de0ceb7d04e65b663051451544 (patch)
tree06e9cd27419a40587bcec19b71010e52b7dfcba4 /drivers/mtd
parentfb49fa533f9d211994c33efb752ffa5b30033729 (diff)
pcmcia: move Vpp setup to struct pcmcia_device
Some drivers prefer to explicitly set Vpp. Instead of passing the voltage inside config_req_t, store it in struct pcmcia_device. CC: linux-ide@vger.kernel.org CC: netdev@vger.kernel.org CC: linux-mtd@lists.infradead.org CC: linux-wireless@vger.kernel.org CC: linux-serial@vger.kernel.org CC: linux-usb@vger.kernel.org CC: linux-scsi@vger.kernel.org Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> (for drivers/bluetooth) Tested-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/maps/pcmciamtd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 31ce404baa3c..ab94c8aebddc 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -570,9 +570,9 @@ static int pcmciamtd_config(struct pcmcia_device *link)
570 dev->vpp = (vpp) ? vpp : link->socket->socket.Vpp; 570 dev->vpp = (vpp) ? vpp : link->socket->socket.Vpp;
571 link->conf.Attributes = 0; 571 link->conf.Attributes = 0;
572 if(setvpp == 2) { 572 if(setvpp == 2) {
573 link->conf.Vpp = dev->vpp; 573 link->vpp = dev->vpp;
574 } else { 574 } else {
575 link->conf.Vpp = 0; 575 link->vpp = 0;
576 } 576 }
577 577
578 link->conf.IntType = INT_MEMORY; 578 link->conf.IntType = INT_MEMORY;