diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 09:51:52 -0600 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 09:51:52 -0600 |
commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
tree | 7064703c5d63d44700085cd701703457730bc06e /drivers/media/video/pwc/pwc-if.c | |
parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/pwc/pwc-if.c')
-rw-r--r-- | drivers/media/video/pwc/pwc-if.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 39fbc970f43d..0d810189dd87 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c @@ -62,7 +62,6 @@ #include <linux/poll.h> #include <linux/slab.h> #include <linux/vmalloc.h> -#include <linux/version.h> #include <asm/io.h> #include "pwc.h" |