aboutsummaryrefslogtreecommitdiffstats
path: root/include/pcmcia
diff options
context:
space:
mode:
Diffstat (limited to 'include/pcmcia')
-rw-r--r--include/pcmcia/cs.h13
-rw-r--r--include/pcmcia/ds.h4
2 files changed, 3 insertions, 14 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 63cb9bbe390e..e13d0cd3f8f7 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -19,19 +19,6 @@
19#include <linux/interrupt.h> 19#include <linux/interrupt.h>
20#endif 20#endif
21 21
22/* ModifyConfiguration */
23typedef struct modconf_t {
24 u_int Attributes;
25 u_int Vcc, Vpp1, Vpp2;
26} modconf_t;
27
28/* Attributes for ModifyConfiguration */
29#define CONF_IRQ_CHANGE_VALID 0x0100
30#define CONF_VCC_CHANGE_VALID 0x0200
31#define CONF_VPP1_CHANGE_VALID 0x0400
32#define CONF_VPP2_CHANGE_VALID 0x0800
33#define CONF_IO_CHANGE_WIDTH 0x1000
34
35/* For RequestConfiguration */ 22/* For RequestConfiguration */
36typedef struct config_req_t { 23typedef struct config_req_t {
37 u_int Attributes; 24 u_int Attributes;
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 6f7cb38d8850..8e307b93f47b 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -212,7 +212,9 @@ int pcmcia_release_window(struct pcmcia_device *p_dev, struct resource *res);
212int pcmcia_map_mem_page(struct pcmcia_device *p_dev, struct resource *res, 212int pcmcia_map_mem_page(struct pcmcia_device *p_dev, struct resource *res,
213 unsigned int offset); 213 unsigned int offset);
214 214
215int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod); 215int pcmcia_fixup_vpp(struct pcmcia_device *p_dev, unsigned char new_vpp);
216int pcmcia_fixup_iowidth(struct pcmcia_device *p_dev);
217
216void pcmcia_disable_device(struct pcmcia_device *p_dev); 218void pcmcia_disable_device(struct pcmcia_device *p_dev);
217 219
218/* IO ports */ 220/* IO ports */