Move b43 pcmcia compat stuff to its own 04-pcmcia.patch
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 4 Aug 2009 18:27:18 +0000 (11:27 -0700)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 4 Aug 2009 18:27:18 +0000 (11:27 -0700)
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
compat/compat.diff
compat/diffs/04-pcmcia.patch [new file with mode: 0644]

index b147fab129343b4e39dc8d231b1fd64b786eaa5a..12a7e291593fba309c784b838cdd98568da0ee69 100644 (file)
 +cfg80211-y += compat-2.6.31.o
 +cfg80211-y += compat-2.6.32.o
 +
---- 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/b43/phy_common.h
 +++ b/drivers/net/wireless/b43/phy_common.h
 @@ -2,6 +2,9 @@
diff --git a/compat/diffs/04-pcmcia.patch b/compat/diffs/04-pcmcia.patch
new file mode 100644 (file)
index 0000000..018f5cc
--- /dev/null
@@ -0,0 +1,14 @@
+--- 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;