X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fbt832.c;fp=drivers%2Fmedia%2Fvideo%2Fbt8xx%2Fbt832.c;h=cc54b62f4601632ae5fee015a8b760fd524a7f05;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=a51876137880b26babbd24b6ae153aa6d2f9fad1;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/media/video/bt8xx/bt832.c b/drivers/media/video/bt832.c
similarity index 98%
rename from drivers/media/video/bt8xx/bt832.c
rename to drivers/media/video/bt832.c
index a51876137..cc54b62f4 100644
--- a/drivers/media/video/bt8xx/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
+#include <media/audiochip.h>
 #include <media/v4l2-common.h>
 
 #include "bttv.h"
@@ -38,7 +39,7 @@
 MODULE_LICENSE("GPL");
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { I2C_ADDR_BT832_ALT1>>1, I2C_ADDR_BT832_ALT2>>1,
+static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,
 				       I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;