Move libertas pcmcia changes to 04-pcmcia.patch

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/compat/compat.diff b/compat/compat.diff
index 12a7e291593fba309c784b838cdd98568da0ee69..d0096b404fa26766d7091a82d2a10c72bb473cb1 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -59,20 +59,6 @@
  
  struct b43_wldev;
  
---- a/drivers/net/wireless/libertas/if_cs.c
-+++ b/drivers/net/wireless/libertas/if_cs.c
-@@ -813,7 +813,11 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
-       tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-       if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 ||
-           (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 ||
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28))
-+          (ret = pcmcia_parse_tuple(NULL,&tuple, &parse)) != 0)
-+#else
-           (ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
-+#endif
-       {
-               lbs_pr_err("error in pcmcia_get_first_tuple etc\n");
-               goto out1;
 --- a/drivers/net/wireless/wl12xx/wl1251_main.c
 +++ b/drivers/net/wireless/wl12xx/wl1251_main.c
 @@ -26,6 +26,9 @@

diff --git a/compat/diffs/04-pcmcia.patch b/compat/diffs/04-pcmcia.patch
index 018f5cc7577bf93be08a44dbe317fa2dff583283..eb7ed5effe3861ecf71a59cc37a49ec1b897f5d3 100644 (file)
--- a/compat/diffs/04-pcmcia.patch
+++ b/compat/diffs/04-pcmcia.patch
@@ -12,3 +12,17 @@
        if (res != 0)
                goto err_kfree_ssb;
  
+--- a/drivers/net/wireless/libertas/if_cs.c
++++ b/drivers/net/wireless/libertas/if_cs.c
+@@ -813,7 +813,11 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
+       tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+       if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 ||
+           (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 ||
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28))
++          (ret = pcmcia_parse_tuple(NULL,&tuple, &parse)) != 0)
++#else
+           (ret = pcmcia_parse_tuple(&tuple, &parse)) != 0)
++#endif
+       {
+               lbs_pr_err("error in pcmcia_get_first_tuple etc\n");
+               goto out1;