|
@@ -694,7 +694,6 @@ static void ide_disable(struct dev *dev)
|
694
|
694
|
ide_software_reset(info->ctrl);
|
695
|
695
|
}
|
696
|
696
|
|
697
|
|
-#ifdef CONFIG_PCI
|
698
|
697
|
static int ide_pci_probe(struct dev *dev, struct pci_device *pci)
|
699
|
698
|
{
|
700
|
699
|
struct disk *disk = (struct disk *)dev;
|
|
@@ -832,12 +831,11 @@ static struct pci_driver ide_driver __pci_driver = {
|
832
|
831
|
.id_count = sizeof(ide_controllers)/sizeof(ide_controllers),
|
833
|
832
|
.class = PCI_CLASS_STORAGE_IDE,
|
834
|
833
|
};
|
835
|
|
-#endif
|
836
|
834
|
|
837
|
835
|
/* The isa driver works but it causes disks to show up twice.
|
838
|
836
|
* comment it out for now.
|
839
|
837
|
*/
|
840
|
|
-#if 0 && defined(CONFIG_ISA)
|
|
838
|
+#if 0
|
841
|
839
|
static int ide_isa_probe(struct dev * dev, unsigned short *probe_addrs)
|
842
|
840
|
{
|
843
|
841
|
struct disk *disk = (struct disk *)dev;
|