From 7fda112d60904c768e6a77e33598049e6dfc2923 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 30 Aug 2008 08:21:13 -0300
Subject: [PATCH] --- yaml --- r: 113883 b: refs/heads/master c:
 20c104d0a4d055cfa3df4fcbae818f8e10bd541a h: refs/heads/master i:   113881:
 f36345027115848c77993b89ac78aa3a387d7a13   113879:
 8a8aa5858da46f30cc2d8d1a826fb43f9857618e v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/cx18/cx18-driver.h | 1 -
 trunk/drivers/media/video/cx18/cx18-i2c.c    | 2 --
 trunk/drivers/media/video/ivtv/ivtv-driver.h | 1 -
 trunk/drivers/media/video/ivtv/ivtv-i2c.c    | 2 --
 trunk/drivers/media/video/vpx3220.c          | 2 --
 6 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index fa7e3985c21d..b30a5dfdf58e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f8ecfab7a1d256707502207c56dd4bf3e3a026e
+refs/heads/master: 20c104d0a4d055cfa3df4fcbae818f8e10bd541a
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.h b/trunk/drivers/media/video/cx18/cx18-driver.h
index 26359897d147..7bdd2fcdf200 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.h
+++ b/trunk/drivers/media/video/cx18/cx18-driver.h
@@ -38,7 +38,6 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/list.h>
 #include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
 #include <linux/pagemap.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
diff --git a/trunk/drivers/media/video/cx18/cx18-i2c.c b/trunk/drivers/media/video/cx18/cx18-i2c.c
index 6023ba3bd3a6..7d8fb25baae8 100644
--- a/trunk/drivers/media/video/cx18/cx18-i2c.c
+++ b/trunk/drivers/media/video/cx18/cx18-i2c.c
@@ -27,8 +27,6 @@
 #include "cx18-av-core.h"
 #include "cx18-i2c.h"
 
-#include <media/ir-kbd-i2c.h>
-
 #define CX18_REG_I2C_1_WR   0xf15000
 #define CX18_REG_I2C_1_RD   0xf15008
 #define CX18_REG_I2C_2_WR   0xf25100
diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.h b/trunk/drivers/media/video/ivtv/ivtv-driver.h
index 2ceb5227637c..b76a12268637 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-driver.h
+++ b/trunk/drivers/media/video/ivtv/ivtv-driver.h
@@ -49,7 +49,6 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/list.h>
 #include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
 #include <linux/pagemap.h>
 #include <linux/scatterlist.h>
 #include <linux/workqueue.h>
diff --git a/trunk/drivers/media/video/ivtv/ivtv-i2c.c b/trunk/drivers/media/video/ivtv/ivtv-i2c.c
index af154238fb9a..24700c211d52 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-i2c.c
@@ -64,8 +64,6 @@
 #include "ivtv-gpio.h"
 #include "ivtv-i2c.h"
 
-#include <media/ir-kbd-i2c.h>
-
 /* i2c implementation for cx23415/6 chip, ivtv project.
  * Author: Kevin Thayer (nufan_wfk at yahoo.com)
  */
diff --git a/trunk/drivers/media/video/vpx3220.c b/trunk/drivers/media/video/vpx3220.c
index 35293029da02..45be9ec8edc4 100644
--- a/trunk/drivers/media/video/vpx3220.c
+++ b/trunk/drivers/media/video/vpx3220.c
@@ -24,8 +24,6 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 
-#include <linux/byteorder/swab.h>
-
 #include <asm/io.h>
 #include <asm/uaccess.h>