From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Tue, 4 Aug 2009 21:10:17 +0000 (-0700)
Subject: Remove pcmcia patch and use a compat define instead
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=219f3f03b1276a42049981010762db29a84f5b07;p=openwrt%2Fstaging%2Fblogic.git

Remove pcmcia patch and use a compat define instead

pcmcia_parse_tuple() can be backported with a simple
define.

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

diff --git a/compat/compat-2.6.28.h b/compat/compat-2.6.28.h
index 40b5320bed84..2ce19f3b6628 100644
--- a/compat/compat-2.6.28.h
+++ b/compat/compat-2.6.28.h
@@ -16,6 +16,7 @@
 #endif
 
 #include <linux/pci.h>
+#include <pcmcia/ds.h>
 
 #ifndef WARN_ONCE
 #define WARN_ONCE(condition, format...) ({                      \
@@ -29,6 +30,8 @@
 })
 #endif /* From include/asm-generic/bug.h */
 
+#define pcmcia_parse_tuple(tuple, parse) pcmcia_parse_tuple(NULL, tuple, parse)
+
 #if 0
 extern void usb_poison_urb(struct urb *urb);
 #endif
diff --git a/compat/diffs/04-pcmcia.patch b/compat/diffs/04-pcmcia.patch
deleted file mode 100644
index eb7ed5effe38..000000000000
--- a/compat/diffs/04-pcmcia.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/net/wireless/b43/pcmcia.c	2009-07-08 23:31:13.028453519 -0700
-+++ b/drivers/net/wireless/b43/pcmcia.c	2009-07-08 23:31:15.213207643 -0700
-@@ -88,7 +88,11 @@ static int __devinit b43_pcmcia_probe(st
- 	res = pcmcia_get_tuple_data(dev, &tuple);
- 	if (res != 0)
- 		goto err_kfree_ssb;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28))
-+	res = pcmcia_parse_tuple(NULL,&tuple, &parse);
-+#else
- 	res = pcmcia_parse_tuple(&tuple, &parse);
-+#endif
- 	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;