MFS: sync with peter's isadma fixup

sys/dev/sound/pcm/sound.h

@@ -50,10 +50,6 @@
 #if __FreeBSD_version < 500000
 #define MODULE_VERSION(mod, ver)
 #define MODULE_DEPEND(mod, dep, min, pref, max)
-
-#define ISADMA_WRITE B_WRITE
-#define ISADMA_READ B_READ
-#define ISADMA_RAW B_RAW
 #endif
 
 #include <sys/module.h>
@@ -96,6 +92,12 @@ struct isa_device { int dummy; };
 #include <dev/sound/pcm/mixer.h>
 #include <dev/sound/pcm/dsp.h>
 
+#ifndef ISADMA_WRITE
+#define ISADMA_WRITE B_WRITE
+#define ISADMA_READ B_READ
+#define ISADMA_RAW B_RAW
+#endif
+
 #define PCM_MODVER	1
 
 #define PCM_MINVER	1