Author: maks
Date: Sat Apr 28 13:53:11 2007
New Revision: 8526
Added:
dists/etch/linux-2.6/debian/patches/bugfix/jmicron-generic-device-conflict.patch
Modified:
dists/etch/linux-2.6/debian/changelog
dists/etch/linux-2.6/debian/patches/series/13
Log:
fix jmicron ide-generic device conflict.
just push the relevant patch as upload expected soon
Modified: dists/etch/linux-2.6/debian/changelog
==
--- dists/etch/linux-2.6/debian/changelog (original)
+++ dists/etch/linux-2.6/debian/changelog Sat Apr 28 13:53:11 2007
@@ -21,6 +21,7 @@
[ maximilian attems ]
* Backport support for i965 to agp too. (closes: #406111)
* Compile fix for UML CONFIG_MODE_TT=y. (closes: #412957)
+ * Fix ide-generic jmicron device conflict. (closes: #421281)
[ Martin Michlmayr ]
* Fix wrong checksum for split TCP packets on 64-bit MIPS. (closes: #421283)
Added:
dists/etch/linux-2.6/debian/patches/bugfix/jmicron-generic-device-conflict.patch
==
--- (empty file)
+++
dists/etch/linux-2.6/debian/patches/bugfix/jmicron-generic-device-conflict.patch
Sat Apr 28 13:53:11 2007
@@ -0,0 +1,80 @@
+From [EMAIL PROTECTED] Wed Jan 31 20:14:02 2007
+Date: Tue, 30 Jan 2007 18:59:36 GMT
+Message-Id: [EMAIL PROTECTED]
+From: Linux Kernel Mailing List [EMAIL PROTECTED]
+To: [EMAIL PROTECTED]
+Subject: ide/generic: Jmicron has its own drivers now
+
+Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3e9e4c8606127592cda22159cc2440ea48963ae4
+Commit: 3e9e4c8606127592cda22159cc2440ea48963ae4
+Parent: e5c073ff24604d4dbb2fbcedb17da6df768468d3
+Author: Alan Cox [EMAIL PROTECTED]
+AuthorDate: Sat Jan 27 13:46:45 2007 +0100
+Committer: Bartlomiej Zolnierkiewicz [EMAIL PROTECTED]
+CommitDate: Sat Jan 27 13:46:45 2007 +0100
+
+ide/generic: Jmicron has its own drivers now
+
+Drop ide-generic support for Jmicron identifiers as we now trust Jmicron.c
for
+this with drivers/ide. The code check remains for the all-generic-ide
case.
+
+Signed-off-by: Alan Cox [EMAIL PROTECTED]
+Signed-off-by: Andrew Morton [EMAIL PROTECTED]
+Signed-off-by: Bartlomiej Zolnierkiewicz [EMAIL PROTECTED]
+---
+ drivers/ide/pci/generic.c | 35 ---
+ 1 files changed, 0 insertions(+), 35 deletions(-)
+
+diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
+index 9f30688..3143cb0 100644
+--- a/drivers/ide/pci/generic.c
b/drivers/ide/pci/generic.c
+@@ -185,36 +185,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata
= {
+ .channels = 2,
+ .autodma= AUTODMA,
+ .bootable = OFF_BOARD,
+- },{ /* 15 */
+- .name = JMB361,
+- .init_hwif = init_hwif_generic,
+- .channels = 2,
+- .autodma= AUTODMA,
+- .bootable = OFF_BOARD,
+- },{ /* 16 */
+- .name = JMB363,
+- .init_hwif = init_hwif_generic,
+- .channels = 2,
+- .autodma= AUTODMA,
+- .bootable = OFF_BOARD,
+- },{ /* 17 */
+- .name = JMB365,
+- .init_hwif = init_hwif_generic,
+- .channels = 2,
+- .autodma= AUTODMA,
+- .bootable = OFF_BOARD,
+- },{ /* 18 */
+- .name = JMB366,
+- .init_hwif = init_hwif_generic,
+- .channels = 2,
+- .autodma= AUTODMA,
+- .bootable = OFF_BOARD,
+- },{ /* 19 */
+- .name = JMB368,
+- .init_hwif = init_hwif_generic,
+- .channels = 2,
+- .autodma= AUTODMA,
+- .bootable = OFF_BOARD,
+ }
+ };
+
+@@ -281,11 +251,6 @@ static struct pci_device_id generic_pci_tbl[] = {
+ { PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 12},
+ { PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 13},
+ { PCI_VENDOR_ID_NETCELL,PCI_DEVICE_ID_REVOLUTION, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 14},
+- { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 15},
+- { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 16},
+- { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 17},
+- { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 18},
+- { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 19},
+ /*
