--- zzzz-none-000/linux-2.6.19.2/drivers/ide/pci/generic.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/ide/pci/generic.c	2007-01-11 07:38:19.000000000 +0000
@@ -48,7 +48,7 @@
 static int __init ide_generic_all_on(char *unused)
 {
 	ide_generic_all = 1;
-	printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n");
+	printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.");
 	return 1;
 }
 __setup("all-generic-ide", ide_generic_all_on);
@@ -247,10 +247,8 @@
 	    (!(PCI_FUNC(dev->devfn) & 1)))
 		goto out;
 
-	if (dev->vendor == PCI_VENDOR_ID_JMICRON) {
-		if (dev->device != PCI_DEVICE_ID_JMICRON_JMB368 && PCI_FUNC(dev->devfn) != 1)
-			goto out;
-	}
+	if (dev->vendor == PCI_VENDOR_ID_JMICRON && PCI_FUNC(dev->devfn) != 1)
+		goto out;
 
 	if (dev->vendor != PCI_VENDOR_ID_JMICRON) {
 		pci_read_config_word(dev, PCI_COMMAND, &command);