summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2014-02-04 06:00:52 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-02-04 07:07:06 -0200
commit9fd9330c2d0ae6c149ec817ec71797f943db98b4 (patch)
tree3cfef430e1fce6519caccaac107997b66cf54a02
parenta3550ea665acd1922df8275379028c1634675629 (diff)
downloadblackbird-op-linux-9fd9330c2d0ae6c149ec817ec71797f943db98b4.tar.gz
blackbird-op-linux-9fd9330c2d0ae6c149ec817ec71797f943db98b4.zip
[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>
-rw-r--r--drivers/media/usb/usbtv/usbtv-core.c2
-rw-r--r--drivers/media/usb/usbtv/usbtv.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c
index e89e48b8f728..d543928d4f01 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 536343da1e47..cb1d388cc647 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>
OpenPOWER on IntegriCloud