Update to 3.0-rc1
Drop patches merged upstream. Refresh debian/version.patch and debian/kernelvariables.patch. svn path=/dists/trunk/linux-2.6/; revision=17483
This commit is contained in:
parent
1b919cfb84
commit
9b084f9c1c
|
@ -1,4 +1,4 @@
|
|||
linux-2.6 (2.6.39-2) UNRELEASED; urgency=low
|
||||
linux-2.6 (3.0~rc1-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
|
||||
|
|
|
@ -1,29 +0,0 @@
|
|||
Subject: [PATCH] xhci-hcd: Include <linux/slab.h> in xhci-pci.c
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Mon, 25 Apr 2011 16:54:28 +0100
|
||||
|
||||
Commit b02d0ed677acb3465e7600366f2353413bf24074 ('xhci: Change
|
||||
hcd_priv into a pointer') added calls to kzalloc() and kfree() in
|
||||
xhci-pci.c. On most architectures <linux/slab.h> is indirectly
|
||||
included, but on some it is not.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
drivers/usb/host/xhci-pci.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
|
||||
index a10494c..cbc4d49 100644
|
||||
--- a/drivers/usb/host/xhci-pci.c
|
||||
+++ b/drivers/usb/host/xhci-pci.c
|
||||
@@ -21,6 +21,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/pci.h>
|
||||
+#include <linux/slab.h>
|
||||
|
||||
#include "xhci.h"
|
||||
|
||||
--
|
||||
1.7.4.4
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
Subject: [PATCH] powerpc/kexec: Fix build failure on 32-bit SMP
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Mon, 25 Apr 2011 02:04:31 +0100
|
||||
|
||||
Commit b987812b3fcaf70fdf0037589e5d2f5f2453e6ce left
|
||||
crash_kexec_wait_realmode() undefined for UP.
|
||||
|
||||
Commit 7c7a81b53e581d727d069cc45df5510516faac31 defined it for UP but
|
||||
left it undefined for 32-bit SMP.
|
||||
|
||||
Seems like people are getting confused by nested #ifdef's, so move the
|
||||
definitions of crash_kexec_wait_realmode() after the #ifdef CONFIG_SMP
|
||||
section.
|
||||
|
||||
Compile-tested with 32-bit UP, 32-bit SMP and 64-bit SMP configurations.
|
||||
|
||||
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
||||
---
|
||||
--- a/arch/powerpc/kernel/crash.c
|
||||
+++ b/arch/powerpc/kernel/crash.c
|
||||
@@ -162,34 +162,6 @@
|
||||
/* Leave the IPI callback set */
|
||||
}
|
||||
|
||||
-/* wait for all the CPUs to hit real mode but timeout if they don't come in */
|
||||
-#ifdef CONFIG_PPC_STD_MMU_64
|
||||
-static void crash_kexec_wait_realmode(int cpu)
|
||||
-{
|
||||
- unsigned int msecs;
|
||||
- int i;
|
||||
-
|
||||
- msecs = 10000;
|
||||
- for (i=0; i < NR_CPUS && msecs > 0; i++) {
|
||||
- if (i == cpu)
|
||||
- continue;
|
||||
-
|
||||
- while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
|
||||
- barrier();
|
||||
- if (!cpu_possible(i)) {
|
||||
- break;
|
||||
- }
|
||||
- if (!cpu_online(i)) {
|
||||
- break;
|
||||
- }
|
||||
- msecs--;
|
||||
- mdelay(1);
|
||||
- }
|
||||
- }
|
||||
- mb();
|
||||
-}
|
||||
-#endif /* CONFIG_PPC_STD_MMU_64 */
|
||||
-
|
||||
/*
|
||||
* This function will be called by secondary cpus or by kexec cpu
|
||||
* if soft-reset is activated to stop some CPUs.
|
||||
@@ -234,7 +206,6 @@
|
||||
}
|
||||
|
||||
#else /* ! CONFIG_SMP */
|
||||
-static inline void crash_kexec_wait_realmode(int cpu) {}
|
||||
|
||||
static void crash_kexec_prepare_cpus(int cpu)
|
||||
{
|
||||
@@ -257,6 +228,36 @@
|
||||
}
|
||||
#endif /* CONFIG_SMP */
|
||||
|
||||
+/* wait for all the CPUs to hit real mode but timeout if they don't come in */
|
||||
+#if defined(CONFIG_SMP) && defined(CONFIG_PPC_STD_MMU_64)
|
||||
+static void crash_kexec_wait_realmode(int cpu)
|
||||
+{
|
||||
+ unsigned int msecs;
|
||||
+ int i;
|
||||
+
|
||||
+ msecs = 10000;
|
||||
+ for (i=0; i < NR_CPUS && msecs > 0; i++) {
|
||||
+ if (i == cpu)
|
||||
+ continue;
|
||||
+
|
||||
+ while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
|
||||
+ barrier();
|
||||
+ if (!cpu_possible(i)) {
|
||||
+ break;
|
||||
+ }
|
||||
+ if (!cpu_online(i)) {
|
||||
+ break;
|
||||
+ }
|
||||
+ msecs--;
|
||||
+ mdelay(1);
|
||||
+ }
|
||||
+ }
|
||||
+ mb();
|
||||
+}
|
||||
+#else
|
||||
+static inline void crash_kexec_wait_realmode(int cpu) {}
|
||||
+#endif /* CONFIG_SMP && CONFIG_PPC_STD_MMU_64 */
|
||||
+
|
||||
/*
|
||||
* Register a function to be called on shutdown. Only use this if you
|
||||
* can't reset your device in the second kernel.
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -192,38 +192,6 @@
|
||||
@@ -198,46 +198,6 @@
|
||||
CROSS_COMPILE ?=
|
||||
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
|
||||
|
||||
|
@ -29,6 +29,14 @@
|
|||
- SRCARCH := sh
|
||||
-endif
|
||||
-
|
||||
-# Additional ARCH settings for tile
|
||||
-ifeq ($(ARCH),tilepro)
|
||||
- SRCARCH := tile
|
||||
-endif
|
||||
-ifeq ($(ARCH),tilegx)
|
||||
- SRCARCH := tile
|
||||
-endif
|
||||
-
|
||||
-# Where to locate arch specific headers
|
||||
-hdr-arch := $(SRCARCH)
|
||||
-
|
||||
|
@ -39,7 +47,7 @@
|
|||
KCONFIG_CONFIG ?= .config
|
||||
export KCONFIG_CONFIG
|
||||
|
||||
@@ -340,6 +311,36 @@ LDFLAGS_MODULE =
|
||||
@@ -354,6 +314,44 @@ LDFLAGS_MODULE =
|
||||
AFLAGS_KERNEL =
|
||||
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
|
||||
|
||||
|
@ -67,6 +75,14 @@
|
|||
+ SRCARCH := sh
|
||||
+endif
|
||||
+
|
||||
+# Additional ARCH settings for tile
|
||||
+ifeq ($(ARCH),tilepro)
|
||||
+ SRCARCH := tile
|
||||
+endif
|
||||
+ifeq ($(ARCH),tilegx)
|
||||
+ SRCARCH := tile
|
||||
+endif
|
||||
+
|
||||
+# Where to locate arch specific headers
|
||||
+hdr-arch := $(SRCARCH)
|
||||
+
|
||||
|
|
|
@ -37,22 +37,12 @@
|
|||
" (" LINUX_COMPILER ") %s\n";
|
||||
--- a/scripts/mkcompile_h
|
||||
+++ b/scripts/mkcompile_h
|
||||
@@ -64,18 +64,34 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
|
||||
@@ -73,7 +73,25 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
|
||||
|
||||
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
|
||||
|
||||
echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
|
||||
- echo \#define LINUX_COMPILE_BY \"`whoami`\"
|
||||
- echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
|
||||
|
||||
- domain=`dnsdomainname 2> /dev/null`
|
||||
- if [ -z "$domain" ]; then
|
||||
- domain=`domainname 2> /dev/null`
|
||||
- fi
|
||||
-
|
||||
- if [ -n "$domain" ]; then
|
||||
- echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\"
|
||||
- else
|
||||
- echo \#define LINUX_COMPILE_DOMAIN
|
||||
- echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
|
||||
- echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
|
||||
+ DISTRIBUTION=$(lsb_release -is 2>/dev/null)
|
||||
+ DISTRIBUTION=${DISTRIBUTION:-Debian}
|
||||
+ echo \#define LINUX_COMPILE_DISTRIBUTION \"$DISTRIBUTION\"
|
||||
|
@ -70,16 +60,8 @@
|
|||
+ echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"unknown\"
|
||||
+ fi
|
||||
+
|
||||
+ echo \#define LINUX_COMPILE_BY \"`whoami`\"
|
||||
+ echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
|
||||
+
|
||||
+ if [ -x /bin/dnsdomainname ]; then
|
||||
+ echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\"
|
||||
+ elif [ -x /bin/domainname ]; then
|
||||
+ echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\"
|
||||
+ else
|
||||
+ echo \#define LINUX_COMPILE_DOMAIN
|
||||
+ fi
|
||||
fi
|
||||
+ echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
|
||||
+ echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`
|
||||
+ fi
|
||||
|
||||
echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
|
||||
|
|
|
@ -1,132 +0,0 @@
|
|||
From: Mark Davis <marked86@gmail.com>
|
||||
Date: Tue, 12 Apr 2011 00:19:10 -0400
|
||||
Subject: [PATCH] rt2800usb: Add seven new USB IDs
|
||||
|
||||
commit b3ba44c6d1633692b45910ee77064e635e2c3143 upstream.
|
||||
|
||||
Adds USB IDs for seven previously missing devices. Additionally, all
|
||||
instances of 'Conceptronic' have been replaced by the OEM name.
|
||||
|
||||
Devices added are..
|
||||
0411:01a2 - Buffalo WLI-UC-GNM, RT3070V
|
||||
0586:341e - ZyXEL NWD2105, RT3070
|
||||
13b1:002f - Linksys AE1000, RT3572
|
||||
13b1:0031 - Cisco / Linksys AM10, RT3072
|
||||
14b2:3c2c - Keebox W150NU / Alpha Networks WUS-N12, RT3070
|
||||
157e:3013 - TRENDnet TEW-645UB, RT2770+RT2720
|
||||
15a9:0012 - Airlink AWLL7025 / Gemtek WUBR-208N, RT2870+RT2850
|
||||
|
||||
Signed-off-by: Mark Davis <marked86@gmail.com>
|
||||
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
|
||||
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
|
||||
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
||||
---
|
||||
drivers/net/wireless/rt2x00/rt2800usb.c | 35 +++++++++++++++++++-----------
|
||||
1 files changed, 22 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
index 6ba31a0..d2f5c87 100644
|
||||
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
@@ -710,6 +710,16 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
{ USB_DEVICE(0x8516, 0x3070), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x8516, 0x3071), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x8516, 0x3072), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ /* Alpha Networks */
|
||||
+ { USB_DEVICE(0x14b2, 0x3c06), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c07), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c09), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c12), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c23), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c25), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c27), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c28), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c2c), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Amit */
|
||||
{ USB_DEVICE(0x15c5, 0x0008), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Askey */
|
||||
@@ -736,15 +746,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
/* Buffalo */
|
||||
{ USB_DEVICE(0x0411, 0x00e8), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x0411, 0x016f), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- /* Conceptronic */
|
||||
- { USB_DEVICE(0x14b2, 0x3c06), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x14b2, 0x3c07), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x14b2, 0x3c09), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x14b2, 0x3c12), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x14b2, 0x3c23), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x14b2, 0x3c25), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x14b2, 0x3c27), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x14b2, 0x3c28), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x0411, 0x01a2), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Corega */
|
||||
{ USB_DEVICE(0x07aa, 0x002f), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x07aa, 0x003c), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
@@ -776,6 +778,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
{ USB_DEVICE(0x1740, 0x9707), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x1740, 0x9708), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x1740, 0x9709), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ /* Gemtek */
|
||||
+ { USB_DEVICE(0x15a9, 0x0012), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Gigabyte */
|
||||
{ USB_DEVICE(0x1044, 0x800b), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x1044, 0x800d), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
@@ -792,6 +796,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
{ USB_DEVICE(0x04bb, 0x0947), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x04bb, 0x0948), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Linksys */
|
||||
+ { USB_DEVICE(0x13b1, 0x0031), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x1737, 0x0070), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x1737, 0x0071), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Logitec */
|
||||
@@ -870,8 +875,9 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
{ USB_DEVICE(0x15a9, 0x0006), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Sweex */
|
||||
{ USB_DEVICE(0x177f, 0x0302), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- /* U-Media*/
|
||||
+ /* U-Media */
|
||||
{ USB_DEVICE(0x157e, 0x300e), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x157e, 0x3013), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* ZCOM */
|
||||
{ USB_DEVICE(0x0cde, 0x0022), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x0cde, 0x0025), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
@@ -883,6 +889,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
/* Zyxel */
|
||||
{ USB_DEVICE(0x0586, 0x3416), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x0586, 0x3418), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x0586, 0x341e), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
#ifdef CONFIG_RT2800USB_RT33XX
|
||||
/* Ralink */
|
||||
{ USB_DEVICE(0x148f, 0x3370), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
@@ -901,6 +908,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
{ USB_DEVICE(0x1740, 0x9801), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* I-O DATA */
|
||||
{ USB_DEVICE(0x04bb, 0x0944), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ /* Linksys */
|
||||
+ { USB_DEVICE(0x13b1, 0x002f), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Ralink */
|
||||
{ USB_DEVICE(0x148f, 0x3572), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Sitecom */
|
||||
@@ -915,6 +924,9 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
* Unclear what kind of devices these are (they aren't supported by the
|
||||
* vendor linux driver).
|
||||
*/
|
||||
+ /* Alpha Networks */
|
||||
+ { USB_DEVICE(0x14b2, 0x3c08), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x14b2, 0x3c11), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Amigo */
|
||||
{ USB_DEVICE(0x0e0b, 0x9031), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x0e0b, 0x9041), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
@@ -933,9 +945,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
{ USB_DEVICE(0x0411, 0x0148), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x0411, 0x0150), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x0411, 0x015d), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- /* Conceptronic */
|
||||
- { USB_DEVICE(0x14b2, 0x3c08), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x14b2, 0x3c11), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Corega */
|
||||
{ USB_DEVICE(0x07aa, 0x0041), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x07aa, 0x0042), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
--
|
||||
1.7.4.4
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From: Ivo van Doorn <IvDoorn@gmail.com>
|
||||
Date: Mon, 28 Mar 2011 13:34:50 +0200
|
||||
Subject: [PATCH] rt2x00: Add support for the ZyXEL NWD-211AN USB
|
||||
|
||||
commit b35e77cf84137bbb4b6888dc90616eb0b452ea36 upstream.
|
||||
|
||||
Add new USB ID
|
||||
|
||||
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
|
||||
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
||||
---
|
||||
drivers/net/wireless/rt2x00/rt2800usb.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
index 8b3ab3f..262bf66 100644
|
||||
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
@@ -877,6 +877,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
{ USB_DEVICE(0x5a57, 0x5257), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Zyxel */
|
||||
{ USB_DEVICE(0x0586, 0x3416), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x0586, 0x3418), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
#ifdef CONFIG_RT2800USB_RT33XX
|
||||
/* Ralink */
|
||||
{ USB_DEVICE(0x148f, 0x3370), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
--
|
||||
1.7.4.4
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From: Gertjan van Wingerde <gwingerde@gmail.com>
|
||||
Date: Mon, 18 Apr 2011 15:31:50 +0200
|
||||
Subject: [PATCH] rt2x00: Linksys WUSB600N rev2 is a RT3572 device.
|
||||
|
||||
commit ce2919c9fffe2aa52f9c3e327176d03764dbf9b5 upstream.
|
||||
|
||||
Move the USB ID entry from the unknown devices to the list of RT35xx based
|
||||
devices.
|
||||
|
||||
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
|
||||
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
|
||||
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
||||
---
|
||||
drivers/net/wireless/rt2x00/rt2800usb.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
index 2005972..1bb9a7d 100644
|
||||
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
|
||||
@@ -983,6 +983,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
{ USB_DEVICE(0x04bb, 0x0944), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Linksys */
|
||||
{ USB_DEVICE(0x13b1, 0x002f), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
+ { USB_DEVICE(0x1737, 0x0079), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Ralink */
|
||||
{ USB_DEVICE(0x148f, 0x3572), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Sitecom */
|
||||
@@ -1041,7 +1042,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
|
||||
/* Linksys */
|
||||
{ USB_DEVICE(0x1737, 0x0077), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
{ USB_DEVICE(0x1737, 0x0078), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
- { USB_DEVICE(0x1737, 0x0079), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Motorola */
|
||||
{ USB_DEVICE(0x100d, 0x9032), USB_DEVICE_DATA(&rt2800usb_ops) },
|
||||
/* Ovislink */
|
||||
--
|
||||
1.7.4.4
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
+ features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
|
||||
+ debian/cgroups-Document-the-Debian-memory-resource-controll.patch
|
||||
+ features/all/rt2x00-Add-support-for-the-ZyXEL-NWD-211AN-USB.patch
|
||||
+ features/all/rt2800usb-Add-seven-new-USB-IDs.patch
|
||||
+ features/all/rt2x00-Linksys-WUSB600N-rev2-is-a-RT3572-device.patch
|
|
@ -41,5 +41,5 @@
|
|||
|
||||
+ debian/sched-autogroup-disabled.patch
|
||||
+ bugfix/all/rt2800-disable-powersaving-as-default.patch
|
||||
+ bugfix/powerpc/powerpc-kexec-Fix-build-failure-on-32-bit-SMP.patch
|
||||
+ bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch
|
||||
+ features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
|
||||
+ debian/cgroups-Document-the-Debian-memory-resource-controll.patch
|
||||
|
|
Loading…
Reference in New Issue