summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-24 12:33:29 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2010-08-03 09:02:42 +0200
commit3dace8cf15ae1dd7c9384758b3a29556b441a90a (patch)
treebd0e1e191fe7f433d7bdc1edb087a8adf50ca46b
parent1d5cc192d431bce2ebe9fde64054ce903200e179 (diff)
downloadlinux-3.10-3dace8cf15ae1dd7c9384758b3a29556b441a90a.tar.gz
linux-3.10-3dace8cf15ae1dd7c9384758b3a29556b441a90a.tar.bz2
linux-3.10-3dace8cf15ae1dd7c9384758b3a29556b441a90a.zip
pcmcia: clean up cs.h
Remove some obsolete definitions from cs.h Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--drivers/pcmcia/rsrc_nonstatic.c3
-rw-r--r--include/pcmcia/cs.h12
2 files changed, 3 insertions, 12 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index 0cca08ff65a..c17a17d9f9b 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -63,6 +63,9 @@ struct socket_data {
#define MEM_PROBE_LOW (1 << 0)
#define MEM_PROBE_HIGH (1 << 1)
+/* Action field */
+#define REMOVE_MANAGED_RESOURCE 1
+#define ADD_MANAGED_RESOURCE 2
/*======================================================================
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 64e853d58c3..7be0fcf7850 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -19,18 +19,6 @@
#include <linux/interrupt.h>
#endif
-/* for AdjustResourceInfo */
-/* Action field */
-#define REMOVE_MANAGED_RESOURCE 1
-#define ADD_MANAGED_RESOURCE 2
-
-/* For CardValues field */
-#define CV_OPTION_VALUE 0x01
-#define CV_STATUS_VALUE 0x02
-#define CV_PIN_REPLACEMENT 0x04
-#define CV_COPY_VALUE 0x08
-#define CV_EXT_STATUS 0x10
-
/* ModifyConfiguration */
typedef struct modconf_t {
u_int Attributes;