summaryrefslogtreecommitdiff
path: root/linux/sound/pci/bt87x.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-02-16 21:49:31 -0500
committerMichael Krufky <mkrufky@linuxtv.org>2008-02-16 21:49:31 -0500
commit381bcd3aa9c4c844cb415342a0ab21622c596488 (patch)
tree75e79ed984e931dc37c254639d99d63d59c4aba6 /linux/sound/pci/bt87x.c
parent7e39be7b7313d51ad3be46803a5918f1b2914b82 (diff)
parent18ac0ef62eca3a89e0bf1f3c23bb7004e760d15b (diff)
downloadmediapointer-dvb-s2-381bcd3aa9c4c844cb415342a0ab21622c596488.tar.gz
mediapointer-dvb-s2-381bcd3aa9c4c844cb415342a0ab21622c596488.tar.bz2
merge: ~stoth/pci-nano
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/sound/pci/bt87x.c')
-rw-r--r--linux/sound/pci/bt87x.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 86c922635..ec58f2795 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -21,7 +21,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <sound/driver.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
@@ -29,6 +28,9 @@
#include <linux/moduleparam.h>
#include <linux/bitops.h>
#include <asm/io.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24)
+#include <sound/driver.h>
+#endif
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>