From: Greg Kroah-Hartman Date: Tue, 11 Aug 2009 18:22:14 +0000 (-0700) Subject: a .27 patch X-Git-Tag: v2.6.30.5~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe1876be81c1fab394fcc13eccf1d35421049000;p=thirdparty%2Fkernel%2Fstable-queue.git a .27 patch --- 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 index 00000000000..fbabff3bfda --- /dev/null +++ b/queue-2.6.27/asix-new-device-ids.patch @@ -0,0 +1,40 @@ +From fef7cc0893146550b286b13c0e6e914556142730 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 24 Feb 2009 23:52:24 -0800 +Subject: asix: new device ids + +From: Greg Kroah-Hartman + +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 +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: David S. Miller + +--- + 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 + }; diff --git a/queue-2.6.27/series b/queue-2.6.27/series index ef169e9476f..09bc3ee52ae 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -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