Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / sound / core.h

diff --git a/include/sound/core.h b/include/sound/core.h
index e5eec5f7350213c8fda3d6f76c3f0a725c22b1e0..35424a971b7a68d89ab75630eac1e197ebae8619 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -43,9 +43,6 @@
 #ifdef CONFIG_PCI
 struct pci_dev;
 #endif
-#ifdef CONFIG_SBUS
-struct sbus_dev;
-#endif
 
 /* device allocation stuff */