[Midnightbsd-cvs] src: firewire.c: Resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
Resolve conflicts

Modified Files:
--------------
    src/sys/boot/i386/libfirewire:
        firewire.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/boot/i386/libfirewire/firewire.c?r1=1.2&r2=1.3)