From 564ed84334304dbcce2c08aea7d305d06e797878 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 15 Sep 2010 15:59:53 -0300
Subject: [PATCH] --- yaml --- r: 219154 b: refs/heads/master c:
 1edc246c32dafd03979a341eec2528b7cdf5c37d h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/radio/tef6862.c         | 1 -
 trunk/drivers/media/video/adv7180.c         | 1 -
 trunk/drivers/media/video/cx18/cx18-ioctl.c | 1 -
 trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 88f90098c68d..10db1a5e4067 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22ac5f67a6c3626bd2834c9095cbc1e56c5abbce
+refs/heads/master: 1edc246c32dafd03979a341eec2528b7cdf5c37d
diff --git a/trunk/drivers/media/radio/tef6862.c b/trunk/drivers/media/radio/tef6862.c
index 90cae90277e7..7c0d77751f6e 100644
--- a/trunk/drivers/media/radio/tef6862.c
+++ b/trunk/drivers/media/radio/tef6862.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/slab.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
diff --git a/trunk/drivers/media/video/adv7180.c b/trunk/drivers/media/video/adv7180.c
index 23e610f62736..d2138d06bcad 100644
--- a/trunk/drivers/media/video/adv7180.c
+++ b/trunk/drivers/media/video/adv7180.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/slab.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/videodev2.h>
diff --git a/trunk/drivers/media/video/cx18/cx18-ioctl.c b/trunk/drivers/media/video/cx18/cx18-ioctl.c
index d6792405f8d3..7150195740dc 100644
--- a/trunk/drivers/media/video/cx18/cx18-ioctl.c
+++ b/trunk/drivers/media/video/cx18/cx18-ioctl.c
@@ -40,7 +40,6 @@
 #include "cx18-av-core.h"
 #include <media/tveeprom.h>
 #include <media/v4l2-chip-ident.h>
-#include <linux/i2c-id.h>
 
 u16 cx18_service2vbi(int type)
 {
diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
index 4eed9123683e..b686da5e4326 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -37,7 +37,6 @@
 #include <media/v4l2-chip-ident.h>
 #include <media/v4l2-event.h>
 #include <linux/dvb/audio.h>
-#include <linux/i2c-id.h>
 
 u16 ivtv_service2vbi(int type)
 {