Browse Source

CONFIG_PCI and CONFIG_ISA no longer exist

tags/v0.9.3
Michael Brown 20 years ago
parent
commit
a0c5430749
1 changed files with 1 additions and 3 deletions
  1. 1
    3
      src/drivers/disk/ide_disk.c

+ 1
- 3
src/drivers/disk/ide_disk.c View File

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

Loading…
Cancel
Save