Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[linux-2.6] / drivers / media / video / m52790.c

diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index 51ecbfbc1ae7d9a829bf85adecbef1c0ad26bbeb..d4bf14c284ef2c967d59c3fe4b588d27170d0b49 100644 (file)
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -30,16 +30,12 @@
 #include <media/m52790.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("i2c device driver for m52790 A/V switch");
 MODULE_AUTHOR("Hans Verkuil");
 MODULE_LICENSE("GPL");
 
-static unsigned short normal_i2c[] = { 0x90 >> 1, I2C_CLIENT_END };
-
-
-I2C_CLIENT_INSMOD;
 
 struct m52790_state {
        u16 input;