Author: glen Date: Mon Mar 30 00:08:35 2009 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- update to 2.4.37
---- Files affected:
SOURCES:
linux-2.4.31-nopckeyb.patch (1.1.10.1 -> 1.1.10.2) ,
linux-2.4.34-i2c-2.10.2-drivers-i2c.diff (1.1 -> 1.1.4.1) ,
linux-2.4-ide-update.patch (1.7.2.2 -> 1.7.2.3) , linux-2.4-libata-update.patch
(1.3.2.1 -> 1.3.2.2)
---- Diffs:
================================================================
Index: SOURCES/linux-2.4.31-nopckeyb.patch
diff -u SOURCES/linux-2.4.31-nopckeyb.patch:1.1.10.1
SOURCES/linux-2.4.31-nopckeyb.patch:1.1.10.2
--- SOURCES/linux-2.4.31-nopckeyb.patch:1.1.10.1 Mon Oct 8 16:35:03 2007
+++ SOURCES/linux-2.4.31-nopckeyb.patch Mon Mar 30 02:08:28 2009
@@ -16,9 +16,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-diff -Naur linux-2.4.31/drivers/char/pc_keyb.c
linux-2.4.31u/drivers/char/pc_keyb.c
---- linux-2.4.31/drivers/char/pc_keyb.c 2002-11-29 00:53:12.000000000
+0100
-+++ linux-2.4.31u/drivers/char/pc_keyb.c 2005-06-15 16:04:19.000000000
+0200
+--- linux-2.4.37/drivers/char/pc_keyb.c~ 2009-03-29 23:45:56.000000000
+0300
++++ linux-2.4.37/drivers/char/pc_keyb.c 2009-03-30 02:53:44.116970100
+0300
@@ -102,6 +102,11 @@
#define MAX_RETRIES 60 /* some aux operations take long time*/
#endif /* CONFIG_PSMOUSE */
@@ -31,12 +30,12 @@
/*
* Wait for keyboard controller input buffer to drain.
*
-@@ -898,7 +903,7 @@
+@@ -920,7 +920,7 @@
void __init pckbd_init_hw(void)
{
-- if (!keyboard_controller_present) {
-+ if (keyboard_disable || !keyboard_controller_present) {
+- if (!kbd_controller_present()) {
++ if (keyboard_disable || !kbd_controller_present()) {
kbd_exists = 0;
return;
}
================================================================
Index: SOURCES/linux-2.4.34-i2c-2.10.2-drivers-i2c.diff
diff -u SOURCES/linux-2.4.34-i2c-2.10.2-drivers-i2c.diff:1.1
SOURCES/linux-2.4.34-i2c-2.10.2-drivers-i2c.diff:1.1.4.1
--- SOURCES/linux-2.4.34-i2c-2.10.2-drivers-i2c.diff:1.1 Sun Feb 18
14:09:06 2007
+++ SOURCES/linux-2.4.34-i2c-2.10.2-drivers-i2c.diff Mon Mar 30 02:08:29 2009
@@ -6854,8 +6854,8 @@
-#endif
+module_init(i2c_bitvelle_init);
+module_exit(i2c_bitvelle_exit);
---- linux-old/include/linux/i2c.h Tue Jan 16 08:30:40 2007
-+++ linux/include/linux/i2c.h Tue Jan 16 08:30:54 2007
+--- linux-2.4.37/include/linux/i2c.h~ 2009-03-29 22:52:13.000000000 +0300
++++ linux-2.4.37/include/linux/i2c.h 2009-03-29 23:43:26.992954441 +0300
@@ -23,27 +23,27 @@
/* With some changes from Ky�sti M�lkki <kmal...@cc.hut.fi> and
Frodo Looijaard <fro...@dds.nl> */
@@ -7024,14 +7024,10 @@
#define I2C_FUNC_SMBUS_QUICK 0x00010000
#define I2C_FUNC_SMBUS_READ_BYTE 0x00020000
#define I2C_FUNC_SMBUS_WRITE_BYTE 0x00040000
-@@ -379,8 +402,10 @@
- #define I2C_FUNC_SMBUS_PROC_CALL 0x00800000
- #define I2C_FUNC_SMBUS_READ_BLOCK_DATA 0x01000000
+@@ -404,6 +404,8 @@
#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000
--#define I2C_FUNC_SMBUS_READ_I2C_BLOCK 0x04000000 /* New I2C-like block */
--#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK 0x08000000 /* transfer */
-+#define I2C_FUNC_SMBUS_READ_I2C_BLOCK 0x04000000 /* I2C-like block xfer */
-+#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK 0x08000000 /* w/ 1-byte reg.
addr. */
+ #define I2C_FUNC_SMBUS_READ_I2C_BLOCK 0x04000000 /* I2C-like block xfer */
+ #define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK 0x08000000 /* w/ 1-byte reg.
addr. */
+#define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 0x10000000 /* I2C-like block
xfer */
+#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2 0x20000000 /* w/ 2-byte reg. addr. */
================================================================
Index: SOURCES/linux-2.4-ide-update.patch
diff -u SOURCES/linux-2.4-ide-update.patch:1.7.2.2
SOURCES/linux-2.4-ide-update.patch:1.7.2.3
--- SOURCES/linux-2.4-ide-update.patch:1.7.2.2 Mon Jan 21 14:05:59 2008
+++ SOURCES/linux-2.4-ide-update.patch Mon Mar 30 02:08:29 2009
@@ -1,5 +1,5 @@
---- linux-2.4.33/include/linux/pci_ids.h.orig 2006-08-17 11:02:44.215971000
+0200
-+++ linux-2.4.33/include/linux/pci_ids.h 2006-08-17 12:11:45.195971000
+0200
+--- linux-2.4.37/include/linux/pci_ids.h~ 2009-03-29 17:41:43.000000000
+0300
++++ linux-2.4.37/include/linux/pci_ids.h 2009-03-29 22:33:05.605551313
+0300
@@ -324,6 +324,7 @@
#define PCI_DEVICE_ID_ATI_IXP300_SATA 0x436e
#define PCI_DEVICE_ID_ATI_IXP400_IDE 0x4376
@@ -30,18 +30,16 @@
#define PCI_DEVICE_ID_SI_5518 0x5518
#define PCI_DEVICE_ID_SI_5571 0x5571
#define PCI_DEVICE_ID_SI_5581 0x5581
-@@ -1052,6 +1057,11 @@
+@@ -1061,6 +1061,9 @@
#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA 0x037E
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2 0x037F
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA 0x03E7
-+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE 0x03EC
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2 0x03F6
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3 0x03F7
-+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE 0x0448
-
- #define PCI_VENDOR_ID_IMS 0x10e0
- #define PCI_DEVICE_ID_IMS_8849 0x8849
+ #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE 0x03EC
+ #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE 0x0448
+ #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE 0x0560
@@ -1154,11 +1164,13 @@
#define PCI_DEVICE_ID_VIA_8233A 0x3147
#define PCI_DEVICE_ID_VIA_P4M266 0x3148
@@ -282,18 +280,6 @@
.device = 0,
--- linux-2.4.33/drivers/ide/pci/amd74xx.c.orig 2004-11-17
12:54:21.000000000 +0100
+++ linux-2.4.33/drivers/ide/pci/amd74xx.c 2006-08-17 13:32:05.035971000
+0200
-@@ -71,7 +71,11 @@
- { PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2, 0x50, AMD_UDMA_133 },
- { PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE, 0x50, AMD_UDMA_133 },
- { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, 0x50, AMD_UDMA_133 },
-+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, 0x50, AMD_UDMA_133 },
- { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, 0x50, AMD_UDMA_133 },
-+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE, 0x50, AMD_UDMA_133 },
-+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE, 0x50, AMD_UDMA_133 },
-+ { PCI_DEVICE_ID_AMD_CS5536_IDE, 0x40, AMD_UDMA_133 },
- { 0 }
- };
-
@@ -341,10 +346,8 @@
break;
@@ -316,19 +302,6 @@
amd_clock = 33333;
}
-@@ -474,7 +474,11 @@
- #endif
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 },
-- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 },
-+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 },
-+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 },
-+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },
-+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 },
-+ { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_IDE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19 },
- { 0, },
- };
-
--- linux-2.4.33/drivers/ide/pci/amd74xx.h.orig 2006-08-17
13:14:23.685971000 +0200
+++ linux-2.4.33/drivers/ide/pci/amd74xx.h 2006-08-17 13:32:20.955971000
+0200
@@ -197,6 +197,61 @@
@@ -439,23 +412,23 @@
{ 0, },
};
---- 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
-@@ -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_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},
+--- linux-2.4.37/drivers/ide/pci/generic.c~ 2009-03-29 17:41:43.000000000
+0300
++++ linux-2.4.37/drivers/ide/pci/generic.c 2009-03-29 22:37:35.949214815
+0300
+@@ -147,6 +147,7 @@
+ { PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_6101, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 13},
+ { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 14},
+ { PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_6145, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 15},
++ { PCI_VENDOR_ID_NETCELL, PCI_DEVICE_ID_REVOLUTION, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 16},
{ 0, },
};
---- linux-2.4.33/drivers/ide/pci/generic.h.orig 2004-08-08
01:26:04.000000000 +0200
-+++ linux-2.4.33/drivers/ide/pci/generic.h 2006-08-17 13:55:01.195971000
+0200
-@@ -157,6 +157,16 @@
- .channels = 2,
- .autodma = NOAUTODMA,
- .bootable = ON_BOARD,
-+ },{ /* 12 */
+--- linux-2.4.37/drivers/ide/pci/generic.h~ 2009-03-29 17:41:43.000000000
+0300
++++ linux-2.4.37/drivers/ide/pci/generic.h 2009-03-29 22:39:14.188986655
+0300
+@@ -197,6 +197,16 @@
+ .channels = 1,
+ .autodma = NOAUTODMA,
+ .bootable = ON_BOARD,
++ },{ /* 16 */
+ .vendor = PCI_VENDOR_ID_NETCELL,
+ .device = PCI_DEVICE_ID_REVOLUTION,
+ .name = "Revolution",
================================================================
Index: SOURCES/linux-2.4-libata-update.patch
diff -u SOURCES/linux-2.4-libata-update.patch:1.3.2.1
SOURCES/linux-2.4-libata-update.patch:1.3.2.2
--- SOURCES/linux-2.4-libata-update.patch:1.3.2.1 Sun Oct 7 15:50:03 2007
+++ SOURCES/linux-2.4-libata-update.patch Mon Mar 30 02:08:29 2009
@@ -19,10 +19,10 @@
{ }
};
---- linux-2.4.33/drivers/scsi/ahci.c.orig 2006-08-11 06:18:20.000000000
+0200
-+++ linux-2.4.33/drivers/scsi/ahci.c 2006-08-18 09:54:07.315971000 +0200
-@@ -287,12 +288,26 @@
- board_ahci }, /* ICH8M */
+--- linux-2.4.37/drivers/scsi/ahci.c~ 2009-03-29 17:34:01.000000000 +0300
++++ linux-2.4.37/drivers/scsi/ahci.c 2009-03-29 17:37:33.810181377 +0300
+@@ -326,8 +326,14 @@
+ /* JMICRON */
{ 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* JMicron JMB360 */
+ { 0x197b, 0x2361, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
@@ -32,22 +32,10 @@
+ { 0x197b, 0x2365, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ board_ahci }, /* JMicron JMB365 */
+ { 0x197b, 0x2366, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-+ board_ahci }, /* JMicron JMB366 */
- { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- board_ahci }, /* ATI SB600 non-raid */
- { PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- board_ahci }, /* ATI SB600 raid */
-+ { PCI_VENDOR_ID_NVIDIA, 0x044c, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-+ board_ahci }, /* NVIDIA MCP65 */
-+ { PCI_VENDOR_ID_NVIDIA, 0x044d, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-+ board_ahci }, /* NVIDIA MCP65 */
-+ { PCI_VENDOR_ID_NVIDIA, 0x044e, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-+ board_ahci }, /* NVIDIA MCP65 */
-+ { PCI_VENDOR_ID_NVIDIA, 0x044f, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
-+ board_ahci }, /* NVIDIA MCP65 */
- { } /* terminate list */
- };
++ board_ahci }, /* JMicron JMB366 */
+ /* ATI */
+ { PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
@@ -787,7 +830,6 @@
struct pci_dev *pdev = to_pci_dev(probe_ent->dev);
void __iomem *mmio = probe_ent->mmio_base;
@@ -94,16 +82,6 @@
#endif
/* NOTE: The following PCI ids must be kept in sync with the
-@@ -116,6 +117,9 @@
- { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
- { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
- { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, esb2_sata },
-+ { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
-+ { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
-+ { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
-
- { } /* terminate list */
- };
--- linux-2.4.33/drivers/pci/quirks.c.orig 2006-08-18 10:01:07.925971000
+0200
+++ linux-2.4.33/drivers/pci/quirks.c 2006-08-18 10:14:03.235971000 +0200
@@ -748,6 +748,9 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.4.31-nopckeyb.patch?r1=1.1.10.1&r2=1.1.10.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.4.34-i2c-2.10.2-drivers-i2c.diff?r1=1.1&r2=1.1.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.4-ide-update.patch?r1=1.7.2.2&r2=1.7.2.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.4-libata-update.patch?r1=1.3.2.1&r2=1.3.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
