From 899781b36c5d5e792a6eaa9e0ad594fab9b9a430 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 7 Mar 2009 17:10:43 +0100
Subject: tlv320aic23b: use v4l2-i2c-drv.h instead of drv-legacy.h

From: Hans Verkuil <hverkuil@xs4all.nl>

This driver isn't used in any legacy mode, so no need for v4l2-i2c-drv-legacy.h.

Priority: normal

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
---
 linux/drivers/media/video/tlv320aic23b.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linux/drivers/media/video')

diff --git a/linux/drivers/media/video/tlv320aic23b.c b/linux/drivers/media/video/tlv320aic23b.c
index 46671fb87..1eac4f7e7 100644
--- a/linux/drivers/media/video/tlv320aic23b.c
+++ b/linux/drivers/media/video/tlv320aic23b.c
@@ -31,16 +31,18 @@
 #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>
 #include "compat.h"
 
 MODULE_DESCRIPTION("tlv320aic23b driver");
 MODULE_AUTHOR("Scott Alfter, Ulf Eklund, Hans Verkuil");
 MODULE_LICENSE("GPL");
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
 static unsigned short normal_i2c[] = { 0x34 >> 1, I2C_CLIENT_END };
 
 I2C_CLIENT_INSMOD;
+#endif
 
 /* ----------------------------------------------------------------------- */
 
-- 
cgit v1.2.3