1 --- a/compat/compat-2.6.28.c
2 +++ b/compat/compat-2.6.28.c
3 @@ -86,7 +86,7 @@ EXPORT_SYMBOL_GPL(usb_poison_urb);
5 #endif /* CONFIG_USB */
7 -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
10 #include <pcmcia/ds.h>
11 struct pcmcia_cfg_mem {
12 --- a/compat/compat-2.6.33.c
13 +++ b/compat/compat-2.6.33.c
15 #include <linux/compat.h>
16 #include <linux/autoconf.h>
18 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
22 * pccard_loop_tuple() - loop over tuples in the CIS
23 @@ -73,7 +73,7 @@ next_entry:
24 EXPORT_SYMBOL(pccard_loop_tuple);
25 /* Source: drivers/pcmcia/cistpl.c */
27 -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
30 struct pcmcia_loop_mem {
31 struct pcmcia_device *p_dev;
32 --- a/include/linux/compat-2.6.28.h
33 +++ b/include/linux/compat-2.6.28.h
36 #endif /* From include/asm-generic/bug.h */
38 -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
41 #include <pcmcia/cs_types.h>
42 #include <pcmcia/cs.h>
43 --- a/include/linux/compat-2.6.33.h
44 +++ b/include/linux/compat-2.6.33.h
47 #include <linux/skbuff.h>
48 #include <linux/pci.h>
49 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
51 #include <pcmcia/cs_types.h>
52 #include <pcmcia/cistpl.h>
53 #include <pcmcia/ds.h>
54 @@ -74,9 +74,9 @@ static inline struct sk_buff *netdev_all
58 -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
61 -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
64 #define pcmcia_request_window(a, b, c) pcmcia_request_window(&a, b, c)