From 396577e920bfc2c3d751b16faa2d923e7400319c Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sat, 24 Jul 2010 12:33:29 +0200
Subject: [PATCH] --- yaml --- r: 206121 b: refs/heads/master c:
 3dace8cf15ae1dd7c9384758b3a29556b441a90a h: refs/heads/master i:   206119:
 dd2670f840658b3f5e89d883ffaf82cf136de565 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/pcmcia/rsrc_nonstatic.c |  3 +++
 trunk/include/pcmcia/cs.h             | 12 ------------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 0042dded77f7..b34653bc70f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d5cc192d431bce2ebe9fde64054ce903200e179
+refs/heads/master: 3dace8cf15ae1dd7c9384758b3a29556b441a90a
diff --git a/trunk/drivers/pcmcia/rsrc_nonstatic.c b/trunk/drivers/pcmcia/rsrc_nonstatic.c
index 0cca08ff65a8..c17a17d9f9b5 100644
--- a/trunk/drivers/pcmcia/rsrc_nonstatic.c
+++ b/trunk/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/trunk/include/pcmcia/cs.h b/trunk/include/pcmcia/cs.h
index 64e853d58c35..7be0fcf78502 100644
--- a/trunk/include/pcmcia/cs.h
+++ b/trunk/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;