aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/zr36060.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-11 23:38:52 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-11 23:38:52 -0500
commit0da36b3467040908d3df6bc1f5b4d592a8b23b63 (patch)
tree4843991fa3a67d9e3cbdfd39eb50574ce8b82c6e /drivers/media/video/zr36060.c
parent8006fdd6dc387abaa4b683bda4868c879fd76070 (diff)
parentcd52d1ee9a92587b242d946a2300a3245d3b885a (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/zr36060.c')
-rw-r--r--drivers/media/video/zr36060.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c
index b50dc403e6d..129744a07ab 100644
--- a/drivers/media/video/zr36060.c
+++ b/drivers/media/video/zr36060.c
@@ -26,7 +26,6 @@
#define ZR060_VERSION "v0.7"
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>