From: Tim Gardner <timg@tpi.com>
Date: Mon, 27 Oct 2008 18:41:21 +0000 (-0600)
Subject: Added backported diffs for pcmcia_parse_tuple() in b43
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=277d20dcc5bcf27fa3ce195af6a614757ed4f68f;p=openwrt%2Fstaging%2Fblogic.git

Added backported diffs for pcmcia_parse_tuple() in b43

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---

diff --git a/compat/compat.diff b/compat/compat.diff
index cc545fb2da90..d86acc4821c7 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -156,3 +156,19 @@
  obj-$(CONFIG_LIBERTAS)		+= libertas/
  
  obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
+diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
+index 3cfc303..33c76b0 100644
+--- a/drivers/net/wireless/b43/pcmcia.c
++++ b/drivers/net/wireless/b43/pcmcia.c
+@@ -87,7 +87,11 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
+ 	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;
+