5 files changed, 10 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index ae69ba065..dce005b14 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -33,6 +33,7 @@
 #include <linux/pci.h>
 
 #include <asm/delay.h>
+#include "compat.h"
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -42,7 +43,6 @@
 #include <sound/tlv.h>
 #endif
 
-#include "compat.h"
 #include "cx88.h"
 #include "cx88-reg.h"
 
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index d9660becc..6f480f61e 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -22,6 +22,7 @@
 #include <linux/time.h>
 #include <linux/wait.h>
 #include <linux/module.h>
+#include "compat.h"
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
diff --git a/linux/sound/i2c/other/tea575x-tuner.c b/linux/sound/i2c/other/tea575x-tuner.c
index 6d1dc0f9f..a7fbe18d0 100644
--- a/linux/sound/i2c/other/tea575x-tuner.c
+++ b/linux/sound/i2c/other/tea575x-tuner.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include "compat.h"
 #include <sound/core.h>
 #include <sound/tea575x-tuner.h>
 
diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c
index 3e820f75c..d1d91bbdc 100644
--- a/linux/sound/pci/bt87x.c
+++ b/linux/sound/pci/bt87x.c
@@ -28,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>
diff --git a/v4l/compat.h b/v4l/compat.h
index b4c1ca374..16a6d03b4 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -497,6 +497,10 @@ do {									\
 #ifndef BIT_MASK
 # define BIT_MASK(nr)            (1UL << ((nr) % BITS_PER_LONG))
 # define BIT_WORD(nr)            ((nr) / BITS_PER_LONG)
+
+#define i2c_verify_client(dev)	\
+	((dev->bus == &i2c_bus_type) ? to_i2c_client(dev) : NULL)
+
 #endif