[PATCH] m68k: namespace pollution fix (custom->amiga_custom)

[linux-2.6] / sound / core / sound.c

diff --git a/sound/core/sound.c b/sound/core/sound.c
index 5febd0545d7d8cc9d0c3cfa6b6f67accee0648c7..a8eda02bcf1c0fe886b922ac0b628f7152a52921 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -23,6 +23,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/time.h>
+#include <linux/device.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/minors.h>
@@ -319,6 +320,7 @@ int snd_unregister_device(int type, struct snd_card *card, int dev)
        return 0;
 }
 
+#ifdef CONFIG_PROC_FS
 /*
  *  INFO PART
  */
@@ -395,6 +397,7 @@ int __exit snd_minor_info_done(void)
                snd_info_unregister(snd_minor_info_entry);
        return 0;
 }
+#endif /* CONFIG_PROC_FS */
 
 /*
  *  INIT PART