[Midnightbsd-cvs] src: include/pc: merge

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge

Modified Files:
--------------
    src/sys/i386/include/pc:
        bios.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/i386/include/pc/bios.h?r1=1.2&r2=1.3)

Removed Files:
-------------
    src/sys/i386/include/pc:
        vesa.h
        (http://cvsweb.midnightbsd.org/src/sys/i386/include/pc/vesa.h)