diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:27:12 -0400 |
| commit | d14b50cc60ca465290fcdb3b88e7d5fb684361ed (patch) | |
| tree | c4a712123b94cd4c0ab4d8d9d87a7619e9bcb6ba /include/media/v4l2-dev.h | |
| parent | a34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf (diff) | |
| parent | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/media/v4l2-dev.h')
| -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 @@ | |||
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | #include <linux/compiler.h> /* need __user */ | 18 | #include <linux/compiler.h> /* need __user */ |
| 19 | #ifdef CONFIG_VIDEO_V4L1 | 19 | #ifdef CONFIG_VIDEO_V4L1_COMPAT |
| 20 | #include <linux/videodev.h> | 20 | #include <linux/videodev.h> |
| 21 | #else | 21 | #else |
| 22 | #include <linux/videodev2.h> | 22 | #include <linux/videodev2.h> |