diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-07-29 15:50:55 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 17:20:21 +0200 |
| commit | e8405f0f617856de0ceb7d04e65b663051451544 (patch) | |
| tree | 06e9cd27419a40587bcec19b71010e52b7dfcba4 /include/pcmcia | |
| parent | pcmcia: split up modify_configuration() into two fixup functions (diff) | |
| download | linux-e8405f0f617856de0ceb7d04e65b663051451544.tar.xz linux-e8405f0f617856de0ceb7d04e65b663051451544.zip | |
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.h | 1 | ||||
| -rw-r--r-- | include/pcmcia/ds.h | 1 |
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 @@ /* For RequestConfiguration */ typedef struct config_req_t { u_int Attributes; - u_int Vpp; /* both Vpp1 and Vpp2 */ u_int IntType; u_int ConfigBase; 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 { /* device setup */ unsigned int irq; struct resource *resource[PCMCIA_NUM_RESOURCES]; + unsigned int vpp; unsigned int io_lines; /* number of I/O lines */ |