From 57197b9b7712eb19f5344c466e8aefbac1adbe55 Mon Sep 17 00:00:00 2001
From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sat, 2 Jan 2010 17:27:33 +0100
Subject: pcmcia: CardBus doesn't need CIS access

At least no in-kernel CardBus-capable PCI driver makes use of the CIS
access functions. Therefore, it seems sensible to remove this unused
code, and cleanup cardbus.c a lot.

CC: Jesse Barnes <jbarnes@virtuousgeek.org>
CC: Linus Torvalds <torvalds@linux-foundation.org>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 include/pcmcia/ss.h | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'include/pcmcia')

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index b0ebd11130cc..b4e5cfd49ce1 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -244,12 +244,6 @@ struct pcmcia_socket {
 #endif /* CONFIG_PCMCIA_IOCTL */
 #endif /* CONFIG_PCMCIA */
 
-	/* cardbus (32-bit) */
-#ifdef CONFIG_CARDBUS
-	struct resource			*cb_cis_res;
-	void __iomem			*cb_cis_virt;
-#endif /* CONFIG_CARDBUS */
-
 	/* socket device */
 	struct device			dev;
 	/* data internal to the socket driver */
-- 
cgit v1.2.3-59-g8ed1b