From 455056d5a84ca76b046c38c0fb7a224086a2e90c Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Mon, 20 Jun 2011 16:14:37 -0300
Subject: [PATCH] --- yaml --- r: 261346 b: refs/heads/master c:
 362d45b23d997c92ec7313e8eb6374c7b085a28e h: refs/heads/master v: v3

---
 [refs]                                             |  2 +-
 trunk/drivers/media/video/marvell-ccic/mcam-core.c | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d8ffb4728fdf..7a0743768af1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5210fd2c737dd178ff0401a0050dc62148fed60
+refs/heads/master: 362d45b23d997c92ec7313e8eb6374c7b085a28e
diff --git a/trunk/drivers/media/video/marvell-ccic/mcam-core.c b/trunk/drivers/media/video/marvell-ccic/mcam-core.c
index 055d843f99df..65d9c0fdecae 100644
--- a/trunk/drivers/media/video/marvell-ccic/mcam-core.c
+++ b/trunk/drivers/media/video/marvell-ccic/mcam-core.c
@@ -11,22 +11,20 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
-#include <linux/videodev2.h>
 #include <linux/slab.h>
-#include <media/v4l2-device.h>
-#include <media/v4l2-ioctl.h>
-#include <media/v4l2-chip-ident.h>
-#include <media/ov7670.h>
-#include <media/videobuf2-vmalloc.h>
 #include <linux/device.h>
 #include <linux/wait.h>
 #include <linux/list.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
-#include <linux/jiffies.h>
 #include <linux/vmalloc.h>
-#include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/ov7670.h>
+#include <media/videobuf2-vmalloc.h>
 
 #include "mcam-core.h"