2010-01-30 00:53:44 +02:00
|
|
|
--- a/compat/compat-2.6.28.c
|
|
|
|
+++ b/compat/compat-2.6.28.c
|
2010-11-12 00:39:12 +02:00
|
|
|
@@ -86,7 +86,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb);
|
2010-01-30 00:53:44 +02:00
|
|
|
#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
|
2012-09-08 14:10:54 +03:00
|
|
|
@@ -10,7 +10,7 @@
|
|
|
|
|
2010-11-12 00:39:12 +02:00
|
|
|
#include <linux/compat.h>
|
2010-01-30 00:53:44 +02:00
|
|
|
|
|
|
|
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
|
|
|
|
+#if 0
|
|
|
|
|
|
|
|
/**
|
|
|
|
* pccard_loop_tuple() - loop over tuples in the CIS
|
2012-09-08 14:10:54 +03:00
|
|
|
@@ -72,7 +72,7 @@ next_entry:
|
2012-04-17 00:08:41 +03:00
|
|
|
EXPORT_SYMBOL_GPL(pccard_loop_tuple);
|
2010-01-30 00:53:44 +02:00
|
|
|
/* 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
|
2012-09-08 14:10:54 +03:00
|
|
|
@@ -49,7 +49,7 @@ typedef u32 phys_addr_t;
|
2010-01-30 00:53:44 +02:00
|
|
|
})
|
|
|
|
#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
|
2011-01-09 22:32:25 +02:00
|
|
|
@@ -7,7 +7,7 @@
|
2010-01-30 00:53:44 +02:00
|
|
|
|
|
|
|
#include <linux/skbuff.h>
|
2011-01-09 22:32:25 +02:00
|
|
|
#include <linux/pci.h>
|
2010-01-30 00:53:44 +02:00
|
|
|
-#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
|
|
|
|
+#if 0
|
|
|
|
#include <pcmcia/cs_types.h>
|
|
|
|
#include <pcmcia/cistpl.h>
|
|
|
|
#include <pcmcia/ds.h>
|
2012-09-08 14:10:54 +03:00
|
|
|
@@ -82,9 +82,9 @@ static inline struct sk_buff *netdev_all
|
2010-01-30 00:53:44 +02:00
|
|
|
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)
|
|
|
|
|