diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-09 01:19:23 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-09 01:19:23 +0400 |
| commit | ad552692a4489917fa4b71f9c6a91baae4aee799 (patch) | |
| tree | 26cd1c8a92f9c8f9a219961fe054adbf877e85f4 /include | |
| parent | 20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6 (diff) | |
| parent | 0851fb48486c044476b019029245cb9b348fca33 (diff) | |
| download | linux-ad552692a4489917fa4b71f9c6a91baae4aee799.tar.xz | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/v4l2-dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index f8665326ed9f..600d61d7d2ab 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -16,7 +16,7 @@ #include <linux/device.h> #include <linux/mutex.h> #include <linux/compiler.h> /* need __user */ -#ifdef CONFIG_VIDEO_V4L1 +#ifdef CONFIG_VIDEO_V4L1_COMPAT #include <linux/videodev.h> #else #include <linux/videodev2.h> |