[kernel] r8501 - in dists/trunk/linux-2.6/debian/patches: debian series

[Bastian Blank]

Author: waldi
Date: Tue Apr 24 08:02:43 2007
New Revision: 8501

Modified:
   dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
* debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch: Fix.
* debian/patches/series/1~experimental.1: Update.


Modified: dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch	Tue Apr 24 08:02:43 2007
@@ -1,17 +1,16 @@
 diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
-index 57c0db3..1d1052d 100644
+index b952c58..5634cc1 100644
 --- a/drivers/ata/ata_piix.c
 +++ b/drivers/ata/ata_piix.c
-@@ -164,46 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
+@@ -164,44 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
  static unsigned int in_module_init = 1;
  
  static const struct pci_device_id piix_pci_tbl[] = {
--#ifdef ATA_ENABLE_PATA
+-	/* Intel PIIX3 for the 430HX etc */
+-	{ 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma },
 -	/* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
 -	/* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
 -	{ 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
--	{ 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
--	{ 0x8086, 0x25a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
 -	/* Intel PIIX4 */
 -	{ 0x8086, 0x7199, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
 -	/* Intel PIIX4 */
@@ -44,7 +43,6 @@
 -	/* ICH7/7-R (i945, i975) UDMA 100*/
 -	{ 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 },
 -	{ 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
--#endif
 -
  	/* NOTE: The following PCI ids must be kept in sync with the
  	 * list in drivers/pci/quirks.c.

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Tue Apr 24 08:02:43 2007
@@ -5,6 +5,8 @@
 + debian/powerpc-mkvmlinuz-support-ppc.patch
 + debian/powerpc-mkvmlinuz-support-powerpc.patch
 
++ debian/drivers-ata-ata_piix-postpone-pata.patch
+
 + bugfix/powerpc/build-links.patch
 + bugfix/powerpc/mv643xx-hotplug-support.patch
 + bugfix/powerpc/oldworld-boot-fix.patch