Merge branch 'fixes-gpio-to-irq' into fixes

[mv-sheeva.git] / include / sound / core.h

diff --git a/include/sound/core.h b/include/sound/core.h
index cea1b5426dfa2f1c42c71f4450224722d1c2daf2..b6e0f57d451d28fe27edb602ae02cba552d5709e 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -26,7 +26,6 @@
 #include <linux/mutex.h>               /* struct mutex */
 #include <linux/rwsem.h>               /* struct rw_semaphore */
 #include <linux/pm.h>                  /* pm_message_t */
-#include <linux/device.h>
 #include <linux/stringify.h>
 
 /* number of supported soundcards */
@@ -39,10 +38,10 @@
 #define CONFIG_SND_MAJOR       116     /* standard configuration */
 
 /* forward declarations */
-#ifdef CONFIG_PCI
 struct pci_dev;
-#endif
 struct module;
+struct device;
+struct device_attribute;
 
 /* device allocation stuff */