diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
| commit | eff68d452f1a6842fb05218fd93c774ffc4dbc5a (patch) | |
| tree | dacd3bd93b5f9260034bb206d7182c4a2bc6fac0 /include/linux/videodev.h | |
| parent | 6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff) | |
| parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/linux/videodev.h')
| -rw-r--r-- | include/linux/videodev.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/videodev.h b/include/linux/videodev.h index 518c7a32175e..8dba97a291f6 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/videodev2.h> | 15 | #include <linux/videodev2.h> |
| 16 | 16 | ||
| 17 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | 17 | #if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__) |
| 18 | #define HAVE_V4L1 1 | ||
| 19 | 18 | ||
| 20 | struct video_capability | 19 | struct video_capability |
| 21 | { | 20 | { |