5 files changed, 71 insertions, 19 deletions

diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char
index 1b238ebae6b3..70dabd1e0652 100644
--- a/arch/um/Kconfig.char
+++ b/arch/um/Kconfig.char
@@ -203,6 +203,10 @@ config SOUND
         tristate
         default UML_SOUND
 
+config SOUND_OSS_CORE
+        bool
+        default UML_SOUND
+
 config HOSTAUDIO
         tristate
         default UML_SOUND
diff --git a/sound/Kconfig b/sound/Kconfig
index 8ebf512ced6c..200aca1faa71 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -28,6 +28,10 @@ menuconfig SOUND
 
 if SOUND
 
+config SOUND_OSS_CORE
+        bool
+        default n
+
 source "sound/oss/dmasound/Kconfig"
 
 if !M68K
@@ -80,6 +84,7 @@ endif # SND
 
 menuconfig SOUND_PRIME
         tristate "Open Sound System (DEPRECATED)"
+        select SOUND_OSS_CORE
         help
           Say 'Y' or 'M' to enable Open Sound System drivers.
 
diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 9c4da1cd4a6b..91f91c5cdb4e 100644
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -44,6 +44,7 @@ config SND_SEQ_DUMMY
           will be called snd-seq-dummy.
 
 config SND_OSSEMUL
+        select SOUND_OSS_CORE
         bool
 
 config SND_MIXER_OSS
diff --git a/sound/oss/dmasound/Kconfig b/sound/oss/dmasound/Kconfig
index 3eb782720e58..f456574a964d 100644
--- a/sound/oss/dmasound/Kconfig
+++ b/sound/oss/dmasound/Kconfig
@@ -42,3 +42,4 @@ config DMASOUND_Q40
 
 config DMASOUND
         tristate
+        select SOUND_OSS_CORE
diff --git a/sound/sound_core.c b/sound/sound_core.c
index 1b04259a4328..68614c3ed541 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -1,5 +1,61 @@
 /*
- *      Sound core handling. Breaks out sound functions to submodules
+ *      Sound core.  This file is composed of two parts.  sound_class
+ *      which is common to both OSS and ALSA and OSS sound core which
+ *      is used OSS or emulation of it.
+ */
+
+/*
+ * First, the common part.
+ */
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/err.h>
+
+#ifdef CONFIG_SOUND_OSS_CORE
+static int __init init_oss_soundcore(void);
+static void __exit cleanup_oss_soundcore(void);
+#else
+static inline int init_oss_soundcore(void)      { return 0; }
+static inline void cleanup_oss_soundcore(void)  { }
+#endif
+
+struct class *sound_class;
+EXPORT_SYMBOL(sound_class);
+
+MODULE_DESCRIPTION("Core sound module");
+MODULE_AUTHOR("Alan Cox");
+MODULE_LICENSE("GPL");
+
+static int __init init_soundcore(void)
+{
+        int rc;
+
+        rc = init_oss_soundcore();
+        if (rc)
+                return rc;
+
+        sound_class = class_create(THIS_MODULE, "sound");
+        if (IS_ERR(sound_class)) {
+                cleanup_oss_soundcore();
+                return PTR_ERR(sound_class);
+        }
+
+        return 0;
+}
+
+static void __exit cleanup_soundcore(void)
+{
+        cleanup_oss_soundcore();
+        class_destroy(sound_class);
+}
+
+module_init(init_soundcore);
+module_exit(cleanup_soundcore);
+
+
+#ifdef CONFIG_SOUND_OSS_CORE
+/*
+ *      OSS sound core handling. Breaks out sound functions to submodules
  *      
  *      Author:         Alan Cox <alan.cox@linux.org>
  *
@@ -34,21 +90,17 @@
  *      locking at some point in 2.3.x.
  */
 
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/fs.h>
 #include <linux/sound.h>
 #include <linux/major.h>
 #include <linux/kmod.h>
-#include <linux/device.h>
 
 #define SOUND_STEP 16
 
-
 struct sound_unit
 {
         int unit_minor;
@@ -64,9 +116,6 @@ extern int msnd_classic_init(void);
 extern int msnd_pinnacle_init(void);
 #endif
 
-struct class *sound_class;
-EXPORT_SYMBOL(sound_class);
-
 /*
  *      Low level list operator. Scan the ordered list, find a hole and
  *      join into it. Called with the lock asserted
@@ -523,31 +572,23 @@ int soundcore_open(struct inode *inode, struct file *file)
         return -ENODEV;
 }
 
-MODULE_DESCRIPTION("Core sound module");
-MODULE_AUTHOR("Alan Cox");
-MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
 
-static void __exit cleanup_soundcore(void)
+static void __exit cleanup_oss_soundcore(void)
 {
         /* We have nothing to really do here - we know the lists must be
            empty */
         unregister_chrdev(SOUND_MAJOR, "sound");
-        class_destroy(sound_class);
 }
 
-static int __init init_soundcore(void)
+static int __init init_oss_soundcore(void)
 {
         if (register_chrdev(SOUND_MAJOR, "sound", &soundcore_fops)==-1) {
                 printk(KERN_ERR "soundcore: sound device already in use.\n");
                 return -EBUSY;
         }
-        sound_class = class_create(THIS_MODULE, "sound");
-        if (IS_ERR(sound_class))
-                return PTR_ERR(sound_class);
 
         return 0;
 }
 
-module_init(init_soundcore);
-module_exit(cleanup_soundcore);
+#endif /* CONFIG_SOUND_OSS_CORE */