From 30735de1517682852eebe6d6e6eced39de5a6411 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 4 Feb 2014 06:00:52 -0300
Subject: [PATCH] upstream: [media] usbtv: fix compiler error due to missing
 module.h

usbtv-video.c needs module.h. So move the module.h include from usbtv-core.c to usbtv.h,
that way both core.c and video.c have it.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 drivers/media/usb/usbtv/usbtv-core.c | 2 --
 drivers/media/usb/usbtv/usbtv.h      | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
index e89e48b..d543928 100644
--- a/drivers/media/usb/usbtv/usbtv-core.c
+++ b/drivers/media/usb/usbtv/usbtv-core.c
@@ -28,8 +28,6 @@
  * GNU General Public License ("GPL").
  */
 
-#include <linux/module.h>
-
 #include "usbtv.h"
 
 int usbtv_set_regs(struct usbtv *usbtv, const u16 regs[][2], int size)
diff --git a/drivers/media/usb/usbtv/usbtv.h b/drivers/media/usb/usbtv/usbtv.h
index 536343d..cb1d388 100644
--- a/drivers/media/usb/usbtv/usbtv.h
+++ b/drivers/media/usb/usbtv/usbtv.h
@@ -19,6 +19,7 @@
  * GNU General Public License ("GPL").
  */
 
+#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
 
-- 
2.7.4