aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-02 11:27:33 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2010-01-17 12:30:13 -0500
commit57197b9b7712eb19f5344c466e8aefbac1adbe55 (patch)
tree077772a4b8ef4b4a4210f3b48a343d76e6368ff0 /include
parent88b060d6c03fcb9e4d2018b4349954c4242a5c7f (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/pcmcia/ss.h6
1 files changed, 0 insertions, 6 deletions
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 {
244#endif /* CONFIG_PCMCIA_IOCTL */ 244#endif /* CONFIG_PCMCIA_IOCTL */
245#endif /* CONFIG_PCMCIA */ 245#endif /* CONFIG_PCMCIA */
246 246
247 /* cardbus (32-bit) */
248#ifdef CONFIG_CARDBUS
249 struct resource *cb_cis_res;
250 void __iomem *cb_cis_virt;
251#endif /* CONFIG_CARDBUS */
252
253 /* socket device */ 247 /* socket device */
254 struct device dev; 248 struct device dev;
255 /* data internal to the socket driver */ 249 /* data internal to the socket driver */