--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
@@ -86,7 +86,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb);
 #endif
 #endif /* CONFIG_USB */
 
-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
+#if 0
 
 #include <pcmcia/ds.h>
 struct pcmcia_cfg_mem {
--- a/compat/compat-2.6.33.c
+++ b/compat/compat-2.6.33.c
@@ -10,7 +10,7 @@
 
 #include <linux/compat.h>
 
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
+#if 0
 
 /**
  * pccard_loop_tuple() - loop over tuples in the CIS
@@ -72,7 +72,7 @@ next_entry:
 EXPORT_SYMBOL_GPL(pccard_loop_tuple);
 /* Source: drivers/pcmcia/cistpl.c */
 
-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
+#if 0
 
 struct pcmcia_loop_mem {
 	struct pcmcia_device *p_dev;
--- a/include/linux/compat-2.6.28.h
+++ b/include/linux/compat-2.6.28.h
@@ -49,7 +49,7 @@ typedef u32 phys_addr_t;
 })
 #endif /* From include/asm-generic/bug.h */
 
-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
+#if 0
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
--- a/include/linux/compat-2.6.33.h
+++ b/include/linux/compat-2.6.33.h
@@ -7,7 +7,7 @@
 
 #include <linux/skbuff.h>
 #include <linux/pci.h>
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
+#if 0
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
@@ -82,9 +82,9 @@ static inline struct sk_buff *netdev_all
 	return skb;
 }
 
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
+#if 0
 
-#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
+#if 0
 
 #define pcmcia_request_window(a, b, c) pcmcia_request_window(&a, b, c)
 
