From fd0060b5622866eb2f3ceedfe987a977a8b4227a Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 15 Jan 2008 11:25:10 -0300
Subject: [PATCH] --- yaml --- r: 76751 b: refs/heads/master c:
 387d447776484b6e1d08973337aa4c834ea7c6bc h: refs/heads/master i:   76749:
 427199bbcc6bb36a52d0e036734ece7dc6ac70f2   76747:
 4025e53c7f00e56311208b70e86faa9912c5de89   76743:
 a6500af7364bc6106dbac82daaa8030c0bde395a   76735:
 e2597d1f53486a8a922952aa9ba4056a95cc2a6d v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/radio/radio-si470x.c | 4 ++--
 trunk/drivers/media/video/stk-webcam.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 31f5777bb0dc..040ecf33eb5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78656acdcf4852547a29e929a1b7a98d5ac65f17
+refs/heads/master: 387d447776484b6e1d08973337aa4c834ea7c6bc
diff --git a/trunk/drivers/media/radio/radio-si470x.c b/trunk/drivers/media/radio/radio-si470x.c
index eccbc750e140..ccb167a1acdc 100644
--- a/trunk/drivers/media/radio/radio-si470x.c
+++ b/trunk/drivers/media/radio/radio-si470x.c
@@ -72,11 +72,11 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/input.h>
-#include <linux/videodev2.h>
-#include <media/v4l2-common.h>
 #include <linux/usb.h>
 #include <linux/hid.h>
 #include <linux/version.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-common.h>
 #include <media/rds.h>
 
 
diff --git a/trunk/drivers/media/video/stk-webcam.c b/trunk/drivers/media/video/stk-webcam.c
index f300eca3c473..d37e5e2594b4 100644
--- a/trunk/drivers/media/video/stk-webcam.c
+++ b/trunk/drivers/media/video/stk-webcam.c
@@ -30,9 +30,9 @@
 #include <linux/kref.h>
 
 #include <linux/usb.h>
+#include <linux/vmalloc.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
-#include <linux/vmalloc.h>
 
 #include "stk-webcam.h"