diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 09:15:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 09:15:35 +0100 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /drivers/media/video/upd64031a.c | |
| parent | tun: Check supplemental groups in TUN/TAP driver. (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds... (diff) | |
| download | linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'drivers/media/video/upd64031a.c')
| -rw-r--r-- | drivers/media/video/upd64031a.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c index 4f16effb530f..f4522bb08916 100644 --- a/drivers/media/video/upd64031a.c +++ b/drivers/media/video/upd64031a.c @@ -21,7 +21,6 @@ */ -#include <linux/version.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/i2c.h> |