From 335e7ad945af89e72c2abc3d3304f0f81e0a9eab Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sat, 24 Jul 2010 17:43:10 +0200
Subject: [PATCH] --- yaml --- r: 206125 b: refs/heads/master c:
 a3d0d4d8dd45779b6e174a8567ffb9b485e472af h: refs/heads/master i:   206123:
 789fb182197411c78bc608a72de11e46cf7212cf v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/pcmcia/cistpl.c      |  3 +++
 trunk/drivers/pcmcia/cs_internal.h |  3 +++
 trunk/include/pcmcia/cs.h          | 19 -------------------
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 0bcaa109fc85..e9afa7addccc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90abdc3b973229bae98dd96649d9f7106cc177a4
+refs/heads/master: a3d0d4d8dd45779b6e174a8567ffb9b485e472af
diff --git a/trunk/drivers/pcmcia/cistpl.c b/trunk/drivers/pcmcia/cistpl.c
index 1733fab469a1..91414a0ddc44 100644
--- a/trunk/drivers/pcmcia/cistpl.c
+++ b/trunk/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/trunk/drivers/pcmcia/cs_internal.h b/trunk/drivers/pcmcia/cs_internal.h
index a85558fc71f3..511ac753b9d9 100644
--- a/trunk/drivers/pcmcia/cs_internal.h
+++ b/trunk/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/trunk/include/pcmcia/cs.h b/trunk/include/pcmcia/cs.h
index ad71bb5a8658..583a4e33039a 100644
--- a/trunk/include/pcmcia/cs.h
+++ b/trunk/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 */