[kernel] r8498 - in dists/sid/linux-2.6/debian: . patches/debian patches/series

[Bastian Blank]

Author: waldi
Date: Tue Apr 24 06:03:10 2007
New Revision: 8498

Added:
   dists/sid/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch   (contents, props changed)
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/3
Log:
Disable pata in ata_piix.

* debian/changelog: Update.
* debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch: Add.
* debian/patches/series/3: Update.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Apr 24 06:03:10 2007
@@ -5,9 +5,10 @@
     fix FTBFS.
 
   [ Bastian Blank ]
-  * Disable new pata drivers. (closes: #419458) 
+  * Disable new pata drivers. (closes: #419458)
+  * Disable pata in ata_piix. 
 
- -- Bastian Blank <waldi at debian.org>  Sat, 21 Apr 2007 13:14:01 +0200
+ -- Bastian Blank <waldi at debian.org>  Tue, 24 Apr 2007 08:01:54 +0200
 
 linux-2.6 (2.6.20-2) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch	Tue Apr 24 06:03:10 2007
@@ -0,0 +1,51 @@
+diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
+index 57c0db3..1d1052d 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);
+ static unsigned int in_module_init = 1;
+ 
+ static const struct pci_device_id piix_pci_tbl[] = {
+-#ifdef ATA_ENABLE_PATA
+-	/* 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 */
+-	{ 0x8086, 0x7601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+-	/* Intel PIIX */
+-	{ 0x8086, 0x84CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+-	/* Intel ICH (i810, i815, i840) UDMA 66*/
+-	{ 0x8086, 0x2411, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_66 },
+-	/* Intel ICH0 : UDMA 33*/
+-	{ 0x8086, 0x2421, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_33 },
+-	/* Intel ICH2M */
+-	{ 0x8086, 0x244A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	/* Intel ICH2 (i810E2, i845, 850, 860) UDMA 100 */
+-	{ 0x8086, 0x244B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	/*  Intel ICH3M */
+-	{ 0x8086, 0x248A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	/* Intel ICH3 (E7500/1) UDMA 100 */
+-	{ 0x8086, 0x248B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	/* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
+-	{ 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	{ 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	/* Intel ICH5 */
+-	{ 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 },
+-	/* C-ICH (i810E2) */
+-	{ 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	/* ESB (855GME/875P + 6300ESB) UDMA 100  */
+-	{ 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	/* ICH6 (and 6) (i915) UDMA 100 */
+-	{ 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+-	/* 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/sid/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/3	(original)
+++ dists/sid/linux-2.6/debian/patches/series/3	Tue Apr 24 06:03:10 2007
@@ -1 +1,2 @@
 + bugfix/arm/disable-broken-config-options2.patch
++ debian/drivers-ata-ata_piix-postpone-pata.patch