SOURCES (AC-branch): linux-2.4-ide-update.patch - updated for 2.4.36

hawk hawk at pld-linux.org
Mon Jan 21 14:06:05 CET 2008


Author: hawk                         Date: Mon Jan 21 13:06:05 2008 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- updated for 2.4.36

---- Files affected:
SOURCES:
   linux-2.4-ide-update.patch (1.7.2.1 -> 1.7.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.4-ide-update.patch
diff -u SOURCES/linux-2.4-ide-update.patch:1.7.2.1 SOURCES/linux-2.4-ide-update.patch:1.7.2.2
--- SOURCES/linux-2.4-ide-update.patch:1.7.2.1	Sun Oct  7 16:00:27 2007
+++ SOURCES/linux-2.4-ide-update.patch	Mon Jan 21 14:05:59 2008
@@ -17,7 +17,7 @@
  #define PCI_VENDOR_ID_TRIDENT		0x1023
  #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000
  #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX	0x2001
-@@ -577,10 +577,12 @@
+@@ -574,10 +577,12 @@
  #define PCI_DEVICE_ID_SI_752		0x0752
  #define PCI_DEVICE_ID_SI_755            0x0755
  #define PCI_DEVICE_ID_SI_900		0x0900
@@ -56,7 +56,7 @@
  #define PCI_DEVICE_ID_VIA_8237A		0x3337
  #define PCI_DEVICE_ID_VIA_86C100A	0x6100
  #define PCI_DEVICE_ID_VIA_8231		0x8231
-@@ -1792,6 +1796,9 @@
+@@ -1785,6 +1797,9 @@
  #define PCI_DEVICE_ID_FARSITE_TE1       0x1610
  #define PCI_DEVICE_ID_FARSITE_TE1C      0x1612
  
@@ -66,7 +66,7 @@
  #define PCI_VENDOR_ID_ALTIMA		0x173b
  #define PCI_DEVICE_ID_ALTIMA_AC1000	0x03e8
  #define PCI_DEVICE_ID_ALTIMA_AC1001	0x03e9
-@@ -1939,6 +1954,7 @@
+@@ -1940,6 +1955,7 @@
  #define PCI_DEVICE_ID_INTEL_82801CA_11	0x248b
  #define PCI_DEVICE_ID_INTEL_82801CA_12	0x248c
  #define PCI_DEVICE_ID_INTEL_82801DB_0	0x24c0
@@ -74,7 +74,7 @@
  #define PCI_DEVICE_ID_INTEL_82801DB_2	0x24c2
  #define PCI_DEVICE_ID_INTEL_82801DB_3	0x24c3
  #define PCI_DEVICE_ID_INTEL_82801DB_4	0x24c4
-@@ -1975,8 +1991,21 @@
+@@ -1976,9 +1992,21 @@
  #define PCI_DEVICE_ID_INTEL_ESB_13	0x25ae
  #define PCI_DEVICE_ID_INTEL_ICH6_0	0x2640
  #define PCI_DEVICE_ID_INTEL_ICH6_1	0x2641
@@ -87,7 +87,7 @@
 +#define PCI_DEVICE_ID_INTEL_ICH7_1	0x27b9
 +#define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
 +#define PCI_DEVICE_ID_INTEL_ICH7_31	0x27bd
-+#define PCI_DEVICE_ID_INTEL_ICH7_21	0x27df
+ #define PCI_DEVICE_ID_INTEL_ICH7_21	0x27df
 +#define PCI_DEVICE_ID_INTEL_ICH8_0	0x2810
 +#define PCI_DEVICE_ID_INTEL_ICH8_1	0x2811
 +#define PCI_DEVICE_ID_INTEL_ICH8_2	0x2812
@@ -131,7 +131,7 @@
  			r->get = pirq_via_get;
 --- linux-2.4.33/drivers/ide/pci/piix.c.orig	2004-11-17 12:54:21.000000000 +0100
 +++ linux-2.4.33/drivers/ide/pci/piix.c	2006-08-17 12:22:01.685971000 +0200
-@@ -149,12 +149,16 @@
+@@ -149,13 +149,16 @@
  			case PCI_DEVICE_ID_INTEL_82801BA_9:
  			case PCI_DEVICE_ID_INTEL_82801CA_10:
  			case PCI_DEVICE_ID_INTEL_82801CA_11:
@@ -143,13 +143,13 @@
  			case PCI_DEVICE_ID_INTEL_ESB_2:
 -			case PCI_DEVICE_ID_INTEL_ICH6_2:
 +			case PCI_DEVICE_ID_INTEL_ICH6_19:
-+			case PCI_DEVICE_ID_INTEL_ICH7_21:
+ 			case PCI_DEVICE_ID_INTEL_ICH7_21:
 +			case PCI_DEVICE_ID_INTEL_ESB2_18:
 +			case PCI_DEVICE_ID_INTEL_ICH8_6:
  				p += sprintf(p, "PIIX4 Ultra 100 ");
  				break;
  			case PCI_DEVICE_ID_INTEL_82372FB_1:
-@@ -289,11 +293,15 @@
+@@ -290,12 +293,15 @@
  		case PCI_DEVICE_ID_INTEL_82801CA_10:
  		case PCI_DEVICE_ID_INTEL_82801CA_11:
  		case PCI_DEVICE_ID_INTEL_82801E_11:
@@ -160,31 +160,25 @@
  		case PCI_DEVICE_ID_INTEL_ESB_2:
 -		case PCI_DEVICE_ID_INTEL_ICH6_2:
 +		case PCI_DEVICE_ID_INTEL_ICH6_19:
-+		case PCI_DEVICE_ID_INTEL_ICH7_21:
+ 		case PCI_DEVICE_ID_INTEL_ICH7_21:
 +		case PCI_DEVICE_ID_INTEL_ESB2_18:
 +		case PCI_DEVICE_ID_INTEL_ICH8_6:
  			mode = 3;
  			break;
  		/* UDMA 66 capable */
-@@ -677,12 +685,16 @@
- 		case PCI_DEVICE_ID_INTEL_82801BA_9:
- 		case PCI_DEVICE_ID_INTEL_82801CA_10:
- 		case PCI_DEVICE_ID_INTEL_82801CA_11:
-+		case PCI_DEVICE_ID_INTEL_82801DB_1:
- 		case PCI_DEVICE_ID_INTEL_82801DB_10:
- 		case PCI_DEVICE_ID_INTEL_82801DB_11:
+@@ -684,8 +690,10 @@
  		case PCI_DEVICE_ID_INTEL_82801EB_11:
  		case PCI_DEVICE_ID_INTEL_82801E_11:
  		case PCI_DEVICE_ID_INTEL_ESB_2:
 -		case PCI_DEVICE_ID_INTEL_ICH6_2:
 +		case PCI_DEVICE_ID_INTEL_ICH6_19:
-+		case PCI_DEVICE_ID_INTEL_ICH7_21:
+ 		case PCI_DEVICE_ID_INTEL_ICH7_21:
 +		case PCI_DEVICE_ID_INTEL_ESB2_18:
 +		case PCI_DEVICE_ID_INTEL_ICH8_6:
  		{
  			unsigned int extra = 0;
  			pci_read_config_dword(dev, 0x54, &extra);
-@@ -848,8 +860,8 @@
+@@ -851,8 +859,8 @@
  		/* Only on the original revision: IDE DMA can hang */
  		if(rev == 0x00)
  			no_piix_dma = 1;
@@ -195,13 +189,13 @@
  			no_piix_dma = 2;
  	}
  	if(no_piix_dma)
-@@ -881,7 +893,11 @@
+@@ -884,8 +892,11 @@
   	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18},
  #endif
  	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19},
 -	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20},
 +	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_19, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20},
-+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},
+ 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21},
 +	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22},
 +	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_18, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 23},
 +	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 24},
@@ -447,11 +441,11 @@
  
 --- linux-2.4.33/drivers/ide/pci/generic.c.orig	2004-08-08 01:26:04.000000000 +0200
 +++ linux-2.4.33/drivers/ide/pci/generic.c	2006-08-17 13:53:55.625971000 +0200
-@@ -143,6 +143,7 @@
- 	{ PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9},
+@@ -144,6 +144,7 @@
  	{ PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10},
  	{ PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11},
-+	{ PCI_VENDOR_ID_NETCELL, PCI_DEVICE_ID_REVOLUTION,         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},
+ 	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_20363,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},
++	{ PCI_VENDOR_ID_NETCELL, PCI_DEVICE_ID_REVOLUTION,         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13},
  	{ 0, },
  };
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.4-ide-update.patch?r1=1.7.2.1&r2=1.7.2.2&f=u



More information about the pld-cvs-commit mailing list