diff options
author | peter <peter@FreeBSD.org> | 2000-10-03 09:23:49 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-10-03 09:23:49 +0000 |
commit | 75d3da548c5d866fe6da1427aeae6262e202a822 (patch) | |
tree | 7adad62a21b540d8380d22170b231534768914b2 | |
parent | 1ae2451ffe206a4708d3009d9da464cc01712d43 (diff) | |
download | FreeBSD-src-75d3da548c5d866fe6da1427aeae6262e202a822.zip FreeBSD-src-75d3da548c5d866fe6da1427aeae6262e202a822.tar.gz |
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.
-rw-r--r-- | sys/conf/files | 9 | ||||
-rw-r--r-- | sys/conf/files.alpha | 9 | ||||
-rw-r--r-- | sys/conf/files.i386 | 9 | ||||
-rw-r--r-- | sys/conf/files.ia64 | 9 | ||||
-rw-r--r-- | sys/conf/files.pc98 | 9 |
5 files changed, 9 insertions, 36 deletions
diff --git a/sys/conf/files b/sys/conf/files index 14dfe88..7930c8f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha index c8373eb..b136395 100644 --- a/sys/conf/files.alpha +++ b/sys/conf/files.alpha @@ -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 diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 352bc38..97af22e 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -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 diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 index a2b3e67..99fe12a 100644 --- a/sys/conf/files.ia64 +++ b/sys/conf/files.ia64 @@ -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 diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index a21947c..66a3045 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -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 |