diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 23:53:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 23:53:32 +0200 |
| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /drivers/media/video/ks0127.h | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
| download | kernel-crypto-65fb0d23fcddd8697c871047b700c78817bdaa43.tar.gz kernel-crypto-65fb0d23fcddd8697c871047b700c78817bdaa43.tar.xz kernel-crypto-65fb0d23fcddd8697c871047b700c78817bdaa43.zip | |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'drivers/media/video/ks0127.h')
| -rw-r--r-- | drivers/media/video/ks0127.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/ks0127.h b/drivers/media/video/ks0127.h index 1ec578833ae..cb8abd5403b 100644 --- a/drivers/media/video/ks0127.h +++ b/drivers/media/video/ks0127.h @@ -24,8 +24,6 @@ #ifndef KS0127_H #define KS0127_H -#include <linux/videodev.h> - /* input channels */ #define KS_INPUT_COMPOSITE_1 0 #define KS_INPUT_COMPOSITE_2 1 |