diff options
-rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 3 | ||||
-rw-r--r-- | include/pcmcia/cs.h | 12 |
2 files changed, 3 insertions, 12 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 0cca08ff65a8..c17a17d9f9b5 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c | |||
@@ -63,6 +63,9 @@ struct socket_data { | |||
63 | #define MEM_PROBE_LOW (1 << 0) | 63 | #define MEM_PROBE_LOW (1 << 0) |
64 | #define MEM_PROBE_HIGH (1 << 1) | 64 | #define MEM_PROBE_HIGH (1 << 1) |
65 | 65 | ||
66 | /* Action field */ | ||
67 | #define REMOVE_MANAGED_RESOURCE 1 | ||
68 | #define ADD_MANAGED_RESOURCE 2 | ||
66 | 69 | ||
67 | /*====================================================================== | 70 | /*====================================================================== |
68 | 71 | ||
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index 64e853d58c35..7be0fcf78502 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h | |||
@@ -19,18 +19,6 @@ | |||
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #endif | 20 | #endif |
21 | 21 | ||
22 | /* for AdjustResourceInfo */ | ||
23 | /* Action field */ | ||
24 | #define REMOVE_MANAGED_RESOURCE 1 | ||
25 | #define ADD_MANAGED_RESOURCE 2 | ||
26 | |||
27 | /* For CardValues field */ | ||
28 | #define CV_OPTION_VALUE 0x01 | ||
29 | #define CV_STATUS_VALUE 0x02 | ||
30 | #define CV_PIN_REPLACEMENT 0x04 | ||
31 | #define CV_COPY_VALUE 0x08 | ||
32 | #define CV_EXT_STATUS 0x10 | ||
33 | |||
34 | /* ModifyConfiguration */ | 22 | /* ModifyConfiguration */ |
35 | typedef struct modconf_t { | 23 | typedef struct modconf_t { |
36 | u_int Attributes; | 24 | u_int Attributes; |