summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-alsa.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/drivers/media/video/cx88/cx88-alsa.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/drivers/media/video/cx88/cx88-alsa.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-alsa.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index f5d65f675..dce005b14 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -33,7 +33,7 @@
#include <linux/pci.h>
#include <asm/delay.h>
-#include <sound/driver.h>
+#include "compat.h"
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -43,7 +43,6 @@
#include <sound/tlv.h>
#endif
-#include "compat.h"
#include "cx88.h"
#include "cx88-reg.h"