Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik 2006-09-13 00:39:09 -04:00
commit b68c5f546e
55 changed files with 352 additions and 149 deletions

View file

@ -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
{

View file

@ -22,8 +22,6 @@
#endif
#include <linux/types.h>
#define HAVE_V4L2 1
/*
* Common stuff for both V4L1 and V4L2
* Moved from videodev.h