From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Tue, 4 Aug 2009 18:30:22 +0000 (-0700)
Subject: Move libertas pcmcia changes to 04-pcmcia.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c03f0056d7437cb0abe98b5fe41b3fcbd11ee4a3;p=openwrt%2Fstaging%2Fblogic.git

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 12a7e291593f..d0096b404fa2 100644
--- 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 018f5cc7577b..eb7ed5effe38 100644
--- 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;