aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
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 /include/pcmcia
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 'include/pcmcia')
-rw-r--r--include/pcmcia/cs.h1
-rw-r--r--include/pcmcia/ds.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index e13d0cd3f8f7..ccb8e6e0dd6b 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -22,7 +22,6 @@
22/* For RequestConfiguration */ 22/* For RequestConfiguration */
23typedef struct config_req_t { 23typedef struct config_req_t {
24 u_int Attributes; 24 u_int Attributes;
25 u_int Vpp; /* both Vpp1 and Vpp2 */
26 u_int IntType; 25 u_int IntType;
27 u_int ConfigBase; 26 u_int ConfigBase;
28 u_char Status, Pin, Copy, ExtStatus; 27 u_char Status, Pin, Copy, ExtStatus;
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 8e307b93f47b..6137fbc34abd 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -94,6 +94,7 @@ struct pcmcia_device {
94 /* device setup */ 94 /* device setup */
95 unsigned int irq; 95 unsigned int irq;
96 struct resource *resource[PCMCIA_NUM_RESOURCES]; 96 struct resource *resource[PCMCIA_NUM_RESOURCES];
97 unsigned int vpp;
97 98
98 unsigned int io_lines; /* number of I/O lines */ 99 unsigned int io_lines; /* number of I/O lines */
99 100