From 73e4e488f601885674fdca69d9026e9363720767 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 4 Aug 2009 11:27:18 -0700 Subject: [PATCH] Move b43 pcmcia compat stuff to its own 04-pcmcia.patch Signed-off-by: Luis R. Rodriguez --- compat/compat.diff | 14 -------------- compat/diffs/04-pcmcia.patch | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 compat/diffs/04-pcmcia.patch diff --git a/compat/compat.diff b/compat/compat.diff index b147fab12934..12a7e291593f 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -47,20 +47,6 @@ +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 index 000000000000..018f5cc7577b --- /dev/null +++ b/compat/diffs/04-pcmcia.patch @@ -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; + -- 2.30.2