git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
media
/
video
/
bw-qcam.c
diff --git
a/drivers/media/video/bw-qcam.c
b/drivers/media/video/bw-qcam.c
index
7d0b6e5
..
cf61c59
100644
(file)
--- a/
drivers/media/video/bw-qcam.c
+++ b/
drivers/media/video/bw-qcam.c
@@
-73,7
+73,6
@@
OTHER DEALINGS IN THE SOFTWARE.
#include <linux/parport.h>
#include <linux/sched.h>
#include <linux/videodev.h>
#include <linux/parport.h>
#include <linux/sched.h>
#include <linux/videodev.h>
-#include <media/v4l2-common.h>
#include <linux/mutex.h>
#include <asm/uaccess.h>
#include <linux/mutex.h>
#include <asm/uaccess.h>
@@
-760,7
+759,7
@@
static int qcam_do_ioctl(struct inode *inode, struct file *file,
{
struct video_picture *p = arg;
if(p->palette!=VIDEO_PALETTE_GREY)
{
struct video_picture *p = arg;
if(p->palette!=VIDEO_PALETTE_GREY)
- return -EINVAL;
+ return -EINVAL;
if(p->depth!=4 && p->depth!=6)
return -EINVAL;
if(p->depth!=4 && p->depth!=6)
return -EINVAL;