[Midnightbsd-cvs] src: dev/wpi: resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
resolve conflicts

Modified Files:
--------------
    src/sys/dev/wpi:
        if_wpi.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/wpi/if_wpi.c?r1=1.4&r2=1.5)
        if_wpireg.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/dev/wpi/if_wpireg.h?r1=1.3&r2=1.4)
        if_wpivar.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/wpi/if_wpivar.h?r1=1.4&r2=1.5)