[kernel] r18383 - in dists/sid/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Tue Dec 13 05:52:42 2011
New Revision: 18383

Log:
staging: r8712u: Add new USB ID (Closes: #651622)

Added:
   dists/sid/linux-2.6/debian/patches/features/all/staging-r8712u-Add-new-USB-ID.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/base

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Dec 12 08:35:14 2011	(r18382)
+++ dists/sid/linux-2.6/debian/changelog	Tue Dec 13 05:52:42 2011	(r18383)
@@ -1,3 +1,10 @@
+linux-2.6 (3.1.5-2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * staging: r8712u: Add new USB ID (Closes: #651622)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Dec 2011 05:50:44 +0000
+
 linux-2.6 (3.1.5-1) unstable; urgency=low
 
   * New upstream stable update:

Added: dists/sid/linux-2.6/debian/patches/features/all/staging-r8712u-Add-new-USB-ID.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/staging-r8712u-Add-new-USB-ID.patch	Tue Dec 13 05:52:42 2011	(r18383)
@@ -0,0 +1,28 @@
+From: Larry Finger <Larry.Finger at lwfinger.net>
+Subject: [PATCH V2] staging: r8712u: Add new USB ID
+Date: Sun, 11 Dec 2011 10:27:54 -0600
+Message-ID: <4ee4da0a.gJM5XfxwTWfv6h1X%Larry.Finger at lwfinger.net>
+Cc: devel at driverdev.osuosl.org, post at rolandgruber.de
+To: Greg Kroah-Hartman <gregkh at suse.de>
+
+Add USB ID for Sitecom WLA-2000 v1.001 WLAN.
+
+Reported-and-tested-by: Roland Gruber <post at rolandgruber.de>
+Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+Cc: Stable <stable at vger.kernel.org>
+---
+
+V2 - fix typo in ID.
+
+Index: staging/drivers/staging/rtl8712/usb_intf.c
+===================================================================
+--- staging.orig/drivers/staging/rtl8712/usb_intf.c
++++ staging/drivers/staging/rtl8712/usb_intf.c
+@@ -89,6 +89,7 @@ static struct usb_device_id rtl871x_usb_
+ 	{USB_DEVICE(0x0DF6, 0x0045)},
+ 	{USB_DEVICE(0x0DF6, 0x0059)}, /* 11n mode disable */
+ 	{USB_DEVICE(0x0DF6, 0x004B)},
++	{USB_DEVICE(0x0DF6, 0x005D)},
+ 	{USB_DEVICE(0x0DF6, 0x0063)},
+ 	/* Sweex */
+ 	{USB_DEVICE(0x177F, 0x0154)},

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Mon Dec 12 08:35:14 2011	(r18382)
+++ dists/sid/linux-2.6/debian/patches/series/base	Tue Dec 13 05:52:42 2011	(r18383)
@@ -86,3 +86,4 @@
 + bugfix/all/0004-staging-brcm80211-restrict-register-access-method-fo.patch
 + bugfix/all/0005-staging-brcm80211-restrict-MIPS-dma-bug-workaround-t.patch
 + debian/inetpeer-hide-ABI-change-in-3.1.5.patch
++ features/all/staging-r8712u-Add-new-USB-ID.patch