| 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); |
| 4 | #endif |
| 5 | #endif /* CONFIG_USB */ |
| 6 | |
| 7 | -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) |
| 8 | +#if 0 |
| 9 | |
| 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 |
| 14 | @@ -11,7 +11,7 @@ |
| 15 | #include <linux/compat.h> |
| 16 | #include <linux/autoconf.h> |
| 17 | |
| 18 | -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE) |
| 19 | +#if 0 |
| 20 | |
| 21 | /** |
| 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 */ |
| 26 | |
| 27 | -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) |
| 28 | +#if 0 |
| 29 | |
| 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 |
| 34 | @@ -44,7 +44,7 @@ typedef u32 phys_addr_t; |
| 35 | }) |
| 36 | #endif /* From include/asm-generic/bug.h */ |
| 37 | |
| 38 | -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) |
| 39 | +#if 0 |
| 40 | |
| 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 |
| 45 | @@ -7,7 +7,7 @@ |
| 46 | |
| 47 | #include <linux/skbuff.h> |
| 48 | #include <linux/pci.h> |
| 49 | -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE) |
| 50 | +#if 0 |
| 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 |
| 55 | return skb; |
| 56 | } |
| 57 | |
| 58 | -#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE) |
| 59 | +#if 0 |
| 60 | |
| 61 | -#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) |
| 62 | +#if 0 |
| 63 | |
| 64 | #define pcmcia_request_window(a, b, c) pcmcia_request_window(&a, b, c) |
| 65 | |
| 66 | |