diff options
| author | peter <peter@FreeBSD.org> | 2000-01-29 15:08:56 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-01-29 15:08:56 +0000 |
| commit | d7e5eb3faac173e7d9640e098621746b86213739 (patch) | |
| tree | 9a2474b2f7c68ec2b1e97af2ab3b083c722e9ad7 /sys/i386/isa/vesa.c | |
| parent | e06faf1d941fbd0cfd397f781f3986049ecce128 (diff) | |
| download | FreeBSD-src-d7e5eb3faac173e7d9640e098621746b86213739.zip FreeBSD-src-d7e5eb3faac173e7d9640e098621746b86213739.tar.gz | |
Use config's conditional compilation rather than using #ifdefs that make
modular compilation harder. I'm doing this because people seem to like
cut/pasting examples of bad practices in existing code.
Diffstat (limited to 'sys/i386/isa/vesa.c')
| -rw-r--r-- | sys/i386/isa/vesa.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c index ee2e463..3fc68af 100644 --- a/sys/i386/isa/vesa.c +++ b/sys/i386/isa/vesa.c @@ -26,16 +26,9 @@ * $FreeBSD$ */ -#include "vga.h" #include "opt_vga.h" -#include "opt_vesa.h" -#include "opt_fb.h" -#ifdef VGA_NO_MODE_CHANGE -#undef VESA -#endif - -#if (NVGA > 0 && defined(VESA)) || defined(KLD_MODULE) +#ifndef VGA_NO_MODE_CHANGE #include <sys/param.h> #include <sys/systm.h> @@ -1642,4 +1635,4 @@ static moduledata_t vesa_mod = { DECLARE_MODULE(vesa, vesa_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); -#endif /* (NVGA > 0 && VESA) || KLD_MODULE */ +#endif /* VGA_NO_MODE_CHANGE */ |
