summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zr36016.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-11 05:51:24 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-11 05:51:24 -0500
commit3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch)
treec4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/media/video/zr36016.c
parent7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (diff)
parent5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff)
downloadkernel-crypto-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.tar.gz
kernel-crypto-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.tar.xz
kernel-crypto-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.zip
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/zr36016.c')
-rw-r--r--drivers/media/video/zr36016.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zr36016.c
index d4740a89cea..4ed898585c7 100644
--- a/drivers/media/video/zr36016.c
+++ b/drivers/media/video/zr36016.c
@@ -26,7 +26,6 @@
#define ZR016_VERSION "v0.7"
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>