Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / include / sound / core.h

diff --git a/include/sound/core.h b/include/sound/core.h
index 1fa2407c966fdc5240d9853395fd22af6f435724..3be5ab782b99c74d6f0a1326eaf28f6108dfa708 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -22,7 +22,6 @@
  *
  */
 
-#include <linux/module.h>
 #include <linux/sched.h>               /* wake_up() */
 #include <linux/mutex.h>               /* struct mutex */
 #include <linux/rwsem.h>               /* struct rw_semaphore */
@@ -43,6 +42,7 @@
 #ifdef CONFIG_PCI
 struct pci_dev;
 #endif
+struct module;
 
 /* device allocation stuff */
 
@@ -326,9 +326,9 @@ void release_and_free_resource(struct resource *res);
 /* --- */
 
 #if defined(CONFIG_SND_DEBUG) || defined(CONFIG_SND_VERBOSE_PRINTK)
+__printf(4, 5)
 void __snd_printk(unsigned int level, const char *file, int line,
-                 const char *format, ...)
-     __attribute__ ((format (printf, 4, 5)));
+                 const char *format, ...);
 #else
 #define __snd_printk(level, file, line, format, args...) \
        printk(format, ##args)