diff --git a/debian/changelog b/debian/changelog index db355f75a..b2532f7e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 13 Dec 2011 05:50:44 +0000 + linux-2.6 (3.1.5-1) unstable; urgency=low * New upstream stable update: diff --git a/debian/patches/features/all/staging-r8712u-Add-new-USB-ID.patch b/debian/patches/features/all/staging-r8712u-Add-new-USB-ID.patch new file mode 100644 index 000000000..dc1dceeae --- /dev/null +++ b/debian/patches/features/all/staging-r8712u-Add-new-USB-ID.patch @@ -0,0 +1,28 @@ +From: Larry Finger +Subject: [PATCH V2] staging: r8712u: Add new USB ID +Date: Sun, 11 Dec 2011 10:27:54 -0600 +Message-ID: <4ee4da0a.gJM5XfxwTWfv6h1X%Larry.Finger@lwfinger.net> +Cc: devel@driverdev.osuosl.org, post@rolandgruber.de +To: Greg Kroah-Hartman + +Add USB ID for Sitecom WLA-2000 v1.001 WLAN. + +Reported-and-tested-by: Roland Gruber +Signed-off-by: Larry Finger +Cc: Stable +--- + +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)}, diff --git a/debian/patches/series/base b/debian/patches/series/base index 8d7628f31..7b4b34a6d 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -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