diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:39:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:39:09 -0400 |
| commit | b68c5f546e951d718edf611c4bd9853753e4b366 (patch) | |
| tree | 9ee71557445ee9ead299ac3e3a5e7d994ab30ad9 /include/linux | |
| parent | b0fea350ce515c6ae01e0f259d9b1ffdec824e22 (diff) | |
| parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
| download | linux-b68c5f546e951d718edf611c4bd9853753e4b366.tar.gz linux-b68c5f546e951d718edf611c4bd9853753e4b366.tar.bz2 linux-b68c5f546e951d718edf611c4bd9853753e4b366.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/videodev.h | 3 | ||||
| -rw-r--r-- | include/linux/videodev2.h | 2 |
2 files changed, 1 insertions, 4 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 @@ #include <linux/videodev2.h> -#ifdef CONFIG_VIDEO_V4L1_COMPAT -#define HAVE_V4L1 1 +#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__) struct video_capability { diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index b7146956a929..e3715d774197 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -22,8 +22,6 @@ #endif #include <linux/types.h> -#define HAVE_V4L2 1 - /* * Common stuff for both V4L1 and V4L2 * Moved from videodev.h |