Move the ata/atapi files to the common area. They were the same on all

platforms.

While here, work around a strange quirk in config(8) that I do not yet
understand.  Rearrange which atapi* files have 'optional' vs. 'count'
so that you can have atapifd without atapicd.  The only difference should
be that this works instead of having a link error because atapi-all.o got
left out of the kernel.
This commit is contained in:
Peter Wemm 2000-10-03 09:23:49 +00:00
parent 0791663f57
commit a6bc3edb3b
5 changed files with 9 additions and 36 deletions

View File

@ -119,6 +119,15 @@ dev/an/if_an_isa.c optional an isa
dev/an/if_an_pccard.c optional an card
dev/an/if_an_pci.c optional an pci
dev/asr/asr.c optional asr pci
dev/ata/ata-all.c count ata
dev/ata/ata-disk.c count atadisk
dev/ata/ata-dma.c optional ata
dev/ata/atapi-all.c optional atapicd
dev/ata/atapi-all.c optional atapifd
dev/ata/atapi-all.c optional atapist
dev/ata/atapi-cd.c count atapicd
dev/ata/atapi-fd.c count atapifd
dev/ata/atapi-tape.c count atapist
dev/awi/am79c930.c optional awi
dev/awi/awi.c optional awi
dev/awi/awi_wep.c optional awi

View File

@ -147,15 +147,6 @@ alpha/tlsb/tlsbmem.c optional dec_kn8ae
alpha/tlsb/zs_tlsb.c optional dec_kn8ae
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/ata/ata-all.c count ata
dev/ata/ata-disk.c count atadisk
dev/ata/ata-dma.c optional ata
dev/ata/atapi-all.c count atapicd
dev/ata/atapi-all.c count atapifd
dev/ata/atapi-all.c count atapist
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
dev/dec/mcclock.c optional mcclock
dev/dec/mcclock_if.m optional mcclock
dev/ed/if_ed_isa.c optional ed isa

View File

@ -89,15 +89,6 @@ contrib/dev/oltr/trlldhm.c optional oltr
contrib/dev/oltr/trlldmac.c optional oltr
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/ata/ata-all.c count ata
dev/ata/ata-disk.c count atadisk
dev/ata/ata-dma.c optional ata
dev/ata/atapi-all.c count atapicd
dev/ata/atapi-all.c count atapifd
dev/ata/atapi-all.c count atapist
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
dev/ed/if_ed_isa.c optional ed isa
dev/eisa/eisaconf.c count eisa
dev/fb/fb.c optional fb

View File

@ -59,15 +59,6 @@ ia64/isa/isa.c optional isa
ia64/isa/isa_dma.c optional isa
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/ata/ata-all.c count ata
dev/ata/ata-disk.c count atadisk
dev/ata/ata-dma.c optional ata
dev/ata/atapi-all.c count atapicd
dev/ata/atapi-all.c count atapifd
dev/ata/atapi-all.c count atapist
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
dev/fb/fb.c optional fb
dev/fb/fb.c optional vga
dev/fb/splash.c count splash

View File

@ -86,15 +86,6 @@ contrib/dev/oltr/trlldhm.c optional oltr
contrib/dev/oltr/trlldmac.c optional oltr
#dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_cbus.c optional aic isa
dev/ata/ata-all.c count ata
dev/ata/ata-disk.c count atadisk
dev/ata/ata-dma.c optional ata
dev/ata/atapi-all.c count atapicd
dev/ata/atapi-all.c count atapifd
dev/ata/atapi-all.c count atapist
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
dev/ed/if_ed_cbus.c optional ed isa
dev/eisa/eisaconf.c count eisa
dev/fb/fb.c optional fb