diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 06:18:25 +0100 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 06:18:25 +0100 |
commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /drivers/media/video/zr36060.c | |
parent | Remove amdtp, cmp drivers. (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.tar.xz linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.zip |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/video/zr36060.c')
-rw-r--r-- | drivers/media/video/zr36060.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c index b50dc403e6db..129744a07abd 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> |