pcmcia: move local definitions out of include/pcmcia/cs.h

Signed-off-by: Dominik Brodowski <[email protected]>
mna · Aug 3, 2010 · a3d0d4d · a3d0d4d
1 parent 90abdc3
commit a3d0d4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
@@ -53,6 +53,9 @@ static const u_int exponent[] = {
 /* Upper limit on reasonable # of tuples */
 #define MAX_TUPLES		200
 
+/* Bits in IRQInfo1 field */
+#define IRQ_INFO2_VALID		0x10
+
 /* 16-bit CIS? */
 static int cis_width;
 module_param(cis_width, int, 0444);

diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
@@ -26,6 +26,9 @@
 /* Flags in client state */
 #define CLIENT_WIN_REQ(i)	(0x1<<(i))
 
+/* Flag to access all functions */
+#define BIND_FN_ALL	0xff
+
 /* Each card function gets one of these guys */
 typedef struct config_t {
 	struct kref	ref;

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
@@ -56,16 +56,6 @@ typedef struct config_req_t {
 #define INT_CARDBUS		0x04
 #define INT_ZOOMED_VIDEO	0x08
 
-/* Bits in IRQInfo1 field */
-#define IRQ_NMI_ID		0x01
-#define IRQ_IOCK_ID		0x02
-#define IRQ_BERR_ID		0x04
-#define IRQ_VEND_ID		0x08
-#define IRQ_INFO2_VALID		0x10
-#define IRQ_LEVEL_ID		0x20
-#define IRQ_PULSE_ID		0x40
-#define IRQ_SHARE_ID		0x80
-
 /* Configuration registers present */
 #define PRESENT_OPTION		0x001
 #define PRESENT_STATUS		0x002
@@ -84,12 +74,6 @@ typedef struct memreq_t {
     u_short	Page;
 } memreq_t;
 
-/* For ModifyWindow */
-typedef struct modwin_t {
-    u_int	Attributes;
-    u_int	AccessSpeed;
-} modwin_t;
-
 /* For RequestWindow */
 typedef struct win_req_t {
     u_int	Attributes;
@@ -121,7 +105,4 @@ typedef struct win_req_t {
 #define WIN_BAR_MASK		0xe000
 #define WIN_BAR_SHIFT		13
 
-/* Flag to bind to all functions */
-#define BIND_FN_ALL	0xff
-
 #endif /* _LINUX_CS_H */