diff options
| author | yokota <yokota@FreeBSD.org> | 2001-08-02 13:22:33 +0000 |
|---|---|---|
| committer | yokota <yokota@FreeBSD.org> | 2001-08-02 13:22:33 +0000 |
| commit | 5ae9960da3f93d3677365b8fb5679dd6b9a007c5 (patch) | |
| tree | 3150a895e3887b45791daa2c87e7c2c273823cc3 /sys/conf | |
| parent | 77d54406d5ea20673161903b635c712d3013fb9f (diff) | |
| download | FreeBSD-src-5ae9960da3f93d3677365b8fb5679dd6b9a007c5.zip FreeBSD-src-5ae9960da3f93d3677365b8fb5679dd6b9a007c5.tar.gz | |
Use #ifdef DEV_SPLASH (from opt_splash.h) rather than
#if NSPLASH > 0 (from splash.h) to test the presence
of the splash driver.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files.alpha | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 2 | ||||
| -rw-r--r-- | sys/conf/files.ia64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.pc98 | 2 | ||||
| -rw-r--r-- | sys/conf/options.alpha | 3 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 1 | ||||
| -rw-r--r-- | sys/conf/options.ia64 | 3 | ||||
| -rw-r--r-- | sys/conf/options.pc98 | 1 |
8 files changed, 12 insertions, 4 deletions
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha index fa26742..c0f834a 100644 --- a/sys/conf/files.alpha +++ b/sys/conf/files.alpha @@ -189,7 +189,7 @@ dev/dec/mcclock_if.m optional mcclock dev/ed/if_ed_isa.c optional ed isa dev/fb/fb.c optional fb dev/fb/fb.c optional vga -dev/fb/splash.c count splash +dev/fb/splash.c optional splash dev/fb/vga.c optional vga dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c count atkbdc diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 1a720b8..cd2f500 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -97,7 +97,7 @@ dev/ed/if_ed_isa.c optional ed isa dev/eisa/eisaconf.c optional eisa dev/fb/fb.c optional fb dev/fb/fb.c optional vga -dev/fb/splash.c count splash +dev/fb/splash.c optional splash dev/fb/vga.c optional vga dev/fe/if_fe_isa.c optional fe isa dev/kbd/atkbd.c optional atkbd diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 index 16fcc3c..4116c51 100644 --- a/sys/conf/files.ia64 +++ b/sys/conf/files.ia64 @@ -58,7 +58,7 @@ dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/fb/fb.c optional fb dev/fb/fb.c optional vga -dev/fb/splash.c count splash +dev/fb/splash.c optional splash dev/fb/vga.c optional vga dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c count atkbdc diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 634e655..dafb934 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -97,7 +97,7 @@ dev/ed/if_ed_cbus.c optional ed isa dev/eisa/eisaconf.c optional eisa dev/fb/fb.c optional fb dev/fb/fb.c optional gdc -dev/fb/splash.c count splash +dev/fb/splash.c optional splash dev/fe/if_fe_cbus.c optional fe isa dev/kbd/kbd.c optional kbd dev/kbd/kbd.c optional sc diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha index 41d733c..cc1f80c 100644 --- a/sys/conf/options.alpha +++ b/sys/conf/options.alpha @@ -75,3 +75,6 @@ TIMER_FREQ opt_clock.h COMPAT_LINUX opt_dontuse.h DEBUG_LINUX opt_linux.h COMPAT_OSF1 opt_dontuse.h + +# Device options +DEV_SPLASH opt_splash.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 6cc4ebc..ba54b1c 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -198,6 +198,7 @@ NDGBPORTS opt_dgb.h # Device options DEV_NPX opt_npx.h DEV_APM opt_apm.h +DEV_SPLASH opt_splash.h # SMB/CIFS requester NETSMB opt_netsmb.h diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64 index 3a34a07..2258e44 100644 --- a/sys/conf/options.ia64 +++ b/sys/conf/options.ia64 @@ -57,3 +57,6 @@ TIMER_FREQ opt_clock.h # SKI emulator options SKI_ROOT_FILESYSTEM opt_ski.h SSC_NSECT opt_ski.h + +# Device options +DEV_SPLASH opt_splash.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 3661e7c..0e8bc75 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -205,6 +205,7 @@ LINE30 opt_syscons.h # Device options DEV_NPX opt_npx.h DEV_APM opt_apm.h +DEV_SPLASH opt_splash.h # SMB/CIFS requester NETSMB opt_netsmb.h |
