diff options
author | jlemon <jlemon@FreeBSD.org> | 1999-06-01 18:20:36 +0000 |
---|---|---|
committer | jlemon <jlemon@FreeBSD.org> | 1999-06-01 18:20:36 +0000 |
commit | b5d4171ff60677d883a8f4fdf912b23d5de9a433 (patch) | |
tree | 37d000a80ae9f6ab9ca36152f3fd48600aa82ae6 /sys/i386/isa/vesa.c | |
parent | d4d2c873635d9e513e6e5720150fd4e44067d68f (diff) | |
download | FreeBSD-src-b5d4171ff60677d883a8f4fdf912b23d5de9a433.zip FreeBSD-src-b5d4171ff60677d883a8f4fdf912b23d5de9a433.tar.gz |
Unifdef VM86.
Reviewed by: silence on on -current
Diffstat (limited to 'sys/i386/isa/vesa.c')
-rw-r--r-- | sys/i386/isa/vesa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c index 1d0763e..d734c64 100644 --- a/sys/i386/isa/vesa.c +++ b/sys/i386/isa/vesa.c @@ -23,20 +23,19 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: vesa.c,v 1.22 1999/03/31 15:27:00 yokota Exp $ + * $Id: vesa.c,v 1.23 1999/05/09 15:57:52 peter Exp $ */ #include "vga.h" #include "opt_vga.h" #include "opt_vesa.h" -#include "opt_vm86.h" #include "opt_fb.h" #ifdef VGA_NO_MODE_CHANGE #undef VESA #endif -#if (NVGA > 0 && defined(VESA) && defined(VM86)) || defined(KLD_MODULE) +#if (NVGA > 0 && defined(VESA)) || defined(KLD_MODULE) #include <sys/param.h> #include <sys/systm.h> @@ -1153,4 +1152,4 @@ static moduledata_t vesa_mod = { DECLARE_MODULE(vesa, vesa_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); -#endif /* (NVGA > 0 && VESA && VM86) || KLD_MODULE */ +#endif /* (NVGA > 0 && VESA) || KLD_MODULE */ |