From a0c5430749bee4d67993cb40f48e3012c4c6f96d Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 18 Apr 2005 10:18:38 +0000 Subject: [PATCH] CONFIG_PCI and CONFIG_ISA no longer exist --- src/drivers/disk/ide_disk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/drivers/disk/ide_disk.c b/src/drivers/disk/ide_disk.c index d7e62aca..c46ca136 100644 --- a/src/drivers/disk/ide_disk.c +++ b/src/drivers/disk/ide_disk.c @@ -694,7 +694,6 @@ static void ide_disable(struct dev *dev) ide_software_reset(info->ctrl); } -#ifdef CONFIG_PCI static int ide_pci_probe(struct dev *dev, struct pci_device *pci) { struct disk *disk = (struct disk *)dev; @@ -832,12 +831,11 @@ static struct pci_driver ide_driver __pci_driver = { .id_count = sizeof(ide_controllers)/sizeof(ide_controllers), .class = PCI_CLASS_STORAGE_IDE, }; -#endif /* The isa driver works but it causes disks to show up twice. * comment it out for now. */ -#if 0 && defined(CONFIG_ISA) +#if 0 static int ide_isa_probe(struct dev * dev, unsigned short *probe_addrs) { struct disk *disk = (struct disk *)dev;