From 19abfbf9314de0ad301bf61385483b9db2b5f047 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 7 Mar 2009 13:10:43 -0300
Subject: [PATCH] --- yaml --- r: 138124 b: refs/heads/master c:
 501cd11a34cd29e20f040bfd8a9e2b6fe6908c91 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/tlv320aic23b.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fc6a6f6c51b0..af71fea3d9ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc5cef8ea4fdc41b44007c5d2c116fe97cb87293
+refs/heads/master: 501cd11a34cd29e20f040bfd8a9e2b6fe6908c91
diff --git a/trunk/drivers/media/video/tlv320aic23b.c b/trunk/drivers/media/video/tlv320aic23b.c
index b6e838ada66d..b8cc7d39a90a 100644
--- a/trunk/drivers/media/video/tlv320aic23b.c
+++ b/trunk/drivers/media/video/tlv320aic23b.c
@@ -31,15 +31,12 @@
 #include <linux/i2c-id.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
-#include <media/v4l2-i2c-drv-legacy.h>
+#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("tlv320aic23b driver");
 MODULE_AUTHOR("Scott Alfter, Ulf Eklund, Hans Verkuil");
 MODULE_LICENSE("GPL");
 
-static unsigned short normal_i2c[] = { 0x34 >> 1, I2C_CLIENT_END };
-
-I2C_CLIENT_INSMOD;
 
 /* ----------------------------------------------------------------------- */