From c1cabb782abfc0bbab82e8e1b7dc66768063bdc8 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Sun, 25 Jun 2006 20:03:59 -0300
Subject: [PATCH] --- yaml --- r: 30830 b: refs/heads/master c:
 b2bbaa93940627aec1d92191cf28a36e6048de6e h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-std.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4361d2480f8..b751f6671a02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4656fb63716af240452adf7b1aab3a9573452fd9
+refs/heads/master: b2bbaa93940627aec1d92191cf28a36e6048de6e
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index ae2038b939d7..c1a2447d3ef7 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -23,8 +23,8 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/firmware.h>
-#include <asm/semaphore.h>
 #include <linux/videodev2.h>
+#include <asm/semaphore.h>
 #include <media/cx2341x.h>
 #include "pvrusb2.h"
 #include "pvrusb2-std.h"
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
index 64ba223c2358..134063693643 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -21,6 +21,8 @@
 
 #include "pvrusb2-std.h"
 #include "pvrusb2-debug.h"
+#include <asm/string.h>
+#include <linux/slab.h>
 
 struct std_name {
 	const char *name;