aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-05-09 06:34:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-05-09 06:34:03 +0000
commitfe70acc95a2c5e630b8ef387a856d730a57598fa (patch)
treee5697ec9c15a34fd0e3293091b2103eec0fcff19 /package/mac80211
parent73a315e7728f6152ea36c26bb95f8b096dd29ca1 (diff)
downloadupstream-fe70acc95a2c5e630b8ef387a856d730a57598fa.tar.gz
upstream-fe70acc95a2c5e630b8ef387a856d730a57598fa.tar.bz2
upstream-fe70acc95a2c5e630b8ef387a856d730a57598fa.zip
mac80211: update compat-wireless to 2009-05-08
SVN-Revision: 15738
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/Makefile4
-rw-r--r--package/mac80211/patches/600-p54usb_without_pm_support.patch16
2 files changed, 2 insertions, 18 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index d3f9e83aff..ad2ea2d7a9 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -17,12 +17,12 @@ ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_23)$(CONFIG_LINUX_2_6_24)$(CONFI
PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c
PATCH_DIR:=./patches-old
else
- PKG_VERSION:=2009-05-01
+ PKG_VERSION:=2009-05-08
PKG_RELEASE:=1
PKG_SOURCE_URL:= \
http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/05 \
http://wireless.kernel.org/download/compat-wireless-2.6
- PKG_MD5SUM:=abc949ec3f7cc57302cca814d9b9c6cd
+ PKG_MD5SUM:=9e973ca21e20e51f0a3c215c980b1f55
endif
PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
diff --git a/package/mac80211/patches/600-p54usb_without_pm_support.patch b/package/mac80211/patches/600-p54usb_without_pm_support.patch
deleted file mode 100644
index 9fa8915c4f..0000000000
--- a/package/mac80211/patches/600-p54usb_without_pm_support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fixes compile error when CONFIG_PM=n is set
-
---- a/drivers/net/wireless/p54/p54usb.c
-+++ b/drivers/net/wireless/p54/p54usb.c
-@@ -919,9 +919,11 @@ static int __devinit p54u_probe(struct u
- priv->common.open = p54u_open;
- priv->common.stop = p54u_stop;
- if (recognized_pipes < P54U_PIPE_NUMBER) {
-+#ifdef CONFIG_PM
- /* ISL3887 needs a full reset on resume */
- udev->reset_resume = 1;
- err = p54u_device_reset(dev);
-+#endif
-
- priv->hw_type = P54U_3887;
- dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr);