[Midnightbsd-cvs] src: sound/driver: resolve conflicts

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/modules/sound/driver:
        Makefile (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/Makefile?r1=1.3&r2=1.4)
    src/sys/modules/sound/driver/ai2s:
        Makefile (r1.1.1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/ai2s/Makefile?r1=1.1.1.1&r2=1.2)
    src/sys/modules/sound/driver/atiixp:
        Makefile (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/atiixp/Makefile?r1=1.3&r2=1.4)
    src/sys/modules/sound/driver/cmi:
        Makefile (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/cmi/Makefile?r1=1.3&r2=1.4)
    src/sys/modules/sound/driver/davbus:
        Makefile (r1.1.1.1 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/davbus/Makefile?r1=1.1.1.1&r2=1.2)
    src/sys/modules/sound/driver/emu10k1:
        Makefile (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/emu10k1/Makefile?r1=1.3&r2=1.4)
    src/sys/modules/sound/driver/envy24:
        Makefile (r1.1.1.2 -> r1.2)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/envy24/Makefile?r1=1.1.1.2&r2=1.2)
    src/sys/modules/sound/driver/ess:
        Makefile (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/ess/Makefile?r1=1.3&r2=1.4)
    src/sys/modules/sound/driver/hda:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/hda/Makefile?r1=1.2&r2=1.3)
    src/sys/modules/sound/driver/uaudio:
        Makefile (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/uaudio/Makefile?r1=1.2&r2=1.3)

Removed Files:
-------------
    src/sys/modules/sound/driver/au88x0:
        Makefile
        (http://cvsweb.midnightbsd.org/src/sys/modules/sound/driver/au88x0/Makefile)