summaryrefslogtreecommitdiffstats
path: root/src/drivers
diff options
context:
space:
mode:
authorMichael Brown2005-04-18 12:18:38 +0200
committerMichael Brown2005-04-18 12:18:38 +0200
commita0c5430749bee4d67993cb40f48e3012c4c6f96d (patch)
tree626effd8142be6c2a66cef2690671923b1f78838 /src/drivers
parentSave a few bytes by using naturally-sized ints. (diff)
downloadipxe-a0c5430749bee4d67993cb40f48e3012c4c6f96d.tar.gz
ipxe-a0c5430749bee4d67993cb40f48e3012c4c6f96d.tar.xz
ipxe-a0c5430749bee4d67993cb40f48e3012c4c6f96d.zip
CONFIG_PCI and CONFIG_ISA no longer exist
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/disk/ide_disk.c4
1 files changed, 1 insertions, 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;