From 7da738206733e3f91dd671a73aac4c037f639656 Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Sun, 12 Oct 2008 09:23:29 -0300
Subject: [PATCH] --- yaml --- r: 114089 b: refs/heads/master c:
 fa405d7094489828014315a34f0c21fba30be38c h: refs/heads/master i:   114087:
 cf9757305a4e063f26ad7de446e4acbf67b2108a v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-417.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7e1ab71d141c..cf1e0cf1b3c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd7ac55c31cb4f42e331d69dde9fc034a68944f
+refs/heads/master: fa405d7094489828014315a34f0c21fba30be38c
diff --git a/trunk/drivers/media/video/cx23885/cx23885-417.c b/trunk/drivers/media/video/cx23885/cx23885-417.c
index e54df8195ec4..395c11fa47ce 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-417.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-417.c
@@ -36,7 +36,6 @@
 #include <media/cx2341x.h>
 
 #include "cx23885.h"
-#include "media/cx2341x.h"
 
 #define CX23885_FIRM_IMAGE_SIZE 376836
 #define CX23885_FIRM_IMAGE_NAME "v4l-cx23885-enc.fw"