Index: head/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
===================================================================
--- head/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c	(revision 291621)
+++ head/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c	(revision 291622)
@@ -1,50 +1,50 @@
 --- kernel/OS/FreeBSD/os_freebsd.c.orig	2011-08-11 19:51:27.000000000 -0400
 +++ kernel/OS/FreeBSD/os_freebsd.c	2012-01-31 15:16:58.000000000 -0500
 @@ -16,6 +16,7 @@
  #include "midi_core.h"
  #include <oss_pci.h>
  #include <sys/conf.h>
 +#include <sys/module.h>
  #include <sys/proc.h>
  #include <sys/sx.h>
  #include <sys/mman.h>
 @@ -315,7 +316,7 @@
  
    if (cards[cardnum]->name != NULL)
      strncpy (ci->longname, cards[cardnum]->name, 128);
 -  ci->shortname[127] = 0;
 +  ci->longname[127] = 0;
  
    if (cards[cardnum]->nick != NULL)
      strncpy (ci->shortname, cards[cardnum]->nick, 16);
 @@ -413,8 +414,17 @@
  
    if (!(flags & CHDEV_VIRTUAL) && (name != NULL))
      {
-+#if __FreeBSD_version >= 801500
++#if __FreeBSD_version >= 900023
 +      if (make_dev_p (MAKEDEV_CHECKNAME, &bsd_cdev, &oss_cdevsw, NULL,
 +		      UID_ROOT, GID_WHEEL, 0666, name, 0))
 +	{
 +	  cmn_err (CE_WARN, "Cannot allocate device node /dev/%s\n", name);
 +	  return;
 +	}
 +#else
        bsd_cdev =
  	make_dev (&oss_cdevsw, num, UID_ROOT, GID_WHEEL, 0666, name, 0);
 +#endif
        cdev->info = bsd_cdev;
      }
  }
 @@ -604,6 +614,12 @@
  {
    oss_device_t *osdev;
  
 +  if (module_lookupbyname("sound") != NULL)
 +    {
 +      cmn_err (CE_WARN, "Open Sound System conflicts with FreeBSD driver\n");
 +      cmn_err (CE_CONT, "Please remove sound(4) from kernel or unload it\n");
 +      return EBUSY;
 +    }
    if ((osdev = PMALLOC (NULL, sizeof (*osdev))) == NULL)
      {
        return ENOSPC;

Property changes on: head/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property