From 3315119e386b037a161bcc78ecc8920cf1f1b8eb Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 1 Aug 2011 23:33:29 +0200
Subject: [PATCH] --- yaml --- r: 264823 b: refs/heads/master c:
 255f5e062ba22c4c2a3635882d4e461d843c5149 h: refs/heads/master i:   264821:
 093e77d916d233fd9fd7392116f66bd523b43fd9   264819:
 59f2e5069e9c112ff0505b4cede4b6acd7297c6c   264815:
 3e5230e2a6da35dd6fa273255298ea122a9fa0e0 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/gadget/uvc.h         | 1 +
 trunk/drivers/usb/gadget/uvc_v4l2.c    | 1 -
 trunk/drivers/usb/storage/realtek_cr.c | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a41443171692..efebb9cd3f61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f5c3125d433b3044b013471fa92f1b5738036fe
+refs/heads/master: 255f5e062ba22c4c2a3635882d4e461d843c5149
diff --git a/trunk/drivers/usb/gadget/uvc.h b/trunk/drivers/usb/gadget/uvc.h
index 5b7919460fd2..81971fbc7ea5 100644
--- a/trunk/drivers/usb/gadget/uvc.h
+++ b/trunk/drivers/usb/gadget/uvc.h
@@ -56,6 +56,7 @@ struct uvc_event
 #include <linux/usb.h>	/* For usb_endpoint_* */
 #include <linux/usb/gadget.h>
 #include <linux/videodev2.h>
+#include <linux/version.h>
 #include <media/v4l2-fh.h>
 
 #include "uvc_queue.h"
diff --git a/trunk/drivers/usb/gadget/uvc_v4l2.c b/trunk/drivers/usb/gadget/uvc_v4l2.c
index 5e807f083bc8..a7158053276a 100644
--- a/trunk/drivers/usb/gadget/uvc_v4l2.c
+++ b/trunk/drivers/usb/gadget/uvc_v4l2.c
@@ -16,7 +16,6 @@
 #include <linux/errno.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
-#include <linux/version.h>
 #include <linux/videodev2.h>
 #include <linux/vmalloc.h>
 #include <linux/wait.h>
diff --git a/trunk/drivers/usb/storage/realtek_cr.c b/trunk/drivers/usb/storage/realtek_cr.c
index 34adc4b42ceb..6fd13068481b 100644
--- a/trunk/drivers/usb/storage/realtek_cr.c
+++ b/trunk/drivers/usb/storage/realtek_cr.c
@@ -25,7 +25,6 @@
 #include <linux/kthread.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>