]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
a .27 patch
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 Aug 2009 18:22:14 +0000 (11:22 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 11 Aug 2009 18:22:14 +0000 (11:22 -0700)
queue-2.6.27/asix-new-device-ids.patch [new file with mode: 0644]
queue-2.6.27/series

diff --git a/queue-2.6.27/asix-new-device-ids.patch b/queue-2.6.27/asix-new-device-ids.patch
new file mode 100644 (file)
index 0000000..fbabff3
--- /dev/null
@@ -0,0 +1,40 @@
+From fef7cc0893146550b286b13c0e6e914556142730 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Date: Tue, 24 Feb 2009 23:52:24 -0800
+Subject: asix: new device ids
+
+From: Greg Kroah-Hartman <gregkh@suse.de>
+
+commit fef7cc0893146550b286b13c0e6e914556142730 upstream.
+
+This patch adds two new device ids to the asix driver.
+
+One comes directly from the asix driver on their web site, the other was
+reported by Armani Liao as needed for the MSI X320 to get the driver to
+work properly for it.
+
+Reported-by: Armani Liao <aliao@novell.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+
+---
+ drivers/net/usb/asix.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/net/usb/asix.c
++++ b/drivers/net/usb/asix.c
+@@ -1456,6 +1456,14 @@ static const struct usb_device_id       produc
+       // ASIX 88772a
+       USB_DEVICE(0x0db0, 0xa877),
+       .driver_info = (unsigned long) &ax88772_info,
++}, {
++      // ABOCOM for pci
++      USB_DEVICE(0x14ea, 0xab11),
++      .driver_info = (unsigned long) &ax88178_info,
++}, {
++      // ASIX 88772a
++      USB_DEVICE(0x0db0, 0xa877),
++      .driver_info = (unsigned long) &ax88772_info,
+ },
+       { },            // END
+ };
index ef169e9476f98103c2b908d64080de36b2f04e30..09bc3ee52ae8d10f005c08998c72919e8d7de1d2 100644 (file)
@@ -12,3 +12,4 @@ parisc-ensure-broadcast-tlb-purge-runs-single-threaded.patch
 ieee1394-sbp2-add-support-for-disks-2-tb.patch
 firewire-sbp2-add-support-for-disks-2-tb.patch
 x86-enable-gart-iommu-only-after-setting-up-protection-methods.patch
+asix-new-device-ids.patch