[kernel] r19385 - dists/sid/linux/debian/patches/features/arm

[Ben Hutchings]

Author: benh
Date: Mon Sep 17 01:08:59 2012
New Revision: 19385

Log:
Add upstream reference for "ahci: Add JMicron 362 device IDs"

Modified:
   dists/sid/linux/debian/patches/features/arm/ahci-Add-JMicron-362-device-IDs.patch

Modified: dists/sid/linux/debian/patches/features/arm/ahci-Add-JMicron-362-device-IDs.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/ahci-Add-JMicron-362-device-IDs.patch	Sun Sep 16 18:30:27 2012	(r19384)
+++ dists/sid/linux/debian/patches/features/arm/ahci-Add-JMicron-362-device-IDs.patch	Mon Sep 17 01:08:59 2012	(r19385)
@@ -1,6 +1,8 @@
-Subject: ahci: Add JMicron 362 device IDs
 From: Ben Hutchings <ben at decadent.org.uk>
-Date: Fri, 22 Jul 2011 01:43:22 +0200
+Date: Mon, 10 Sep 2012 01:09:04 +0100
+Subject: ahci: Add JMicron 362 device IDs
+
+commit 1fefb8fdc6562057a0e4e4542f3d4323981c9686 upstream.
 
 The JMicron JMB362 controller supports AHCI only, but some revisions
 use the IDE class code.  These need to be matched by device ID.
@@ -8,14 +10,18 @@
 These additions have apparently been included by QNAP in their NAS
 devices using these controllers.
 
+References: http://bugs.debian.org/634180
 Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
 ---
  drivers/ata/ahci.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 1 file changed, 3 insertions(+)
 
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index 50d5dea..c3f52eb 100644
 --- a/drivers/ata/ahci.c
 +++ b/drivers/ata/ahci.c
-@@ -264,6 +264,9 @@ static const struct pci_device_id ahci_p
+@@ -268,6 +268,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
  	/* JMicron 360/1/3/5/6, match class to avoid IDE function */
  	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
  	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },