From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 16:35:11 +0000 (-0700)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v2.6.37-rc1~64
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=0851668fdd97e526b2a41f794b785c204dd3d3e0

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)
  [media] af9015: Fix max I2C message size when used with tda18271
  [media] IR: initialize ir_raw_event in few more drivers
  [media] Guard a divide in v4l1 compat layer
  [media] imon: fix nomouse modprobe option
  [media] imon: remove redundant change_protocol call
  [media] imon: fix my egregious brown paper bag w/rdev/idev split
  [media] cafe_ccic: Configure ov7670 correctly
  [media] ov7670: allow configuration of image size, clock speed, and I/O method
  [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]
  [media] af9015: map DigitalNow TinyTwin v2 remote
  [media] DigitalNow TinyTwin remote controller
  [media] af9015: RC fixes and improvements
  videodev2.h.xml: Update to reflect the latest changes at videodev2.h
  [media] v4l: document new Bayer and monochrome pixel formats
  [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028
  [media] firedtv: add parameter to fake ca_system_ids in CA_INFO
  [media] tm6000: fix a macro coding style issue
  tm6000: Remove some ugly debug code
  [media] Nova-S-Plus audio line input
  [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers
  ...
---

0851668fdd97e526b2a41f794b785c204dd3d3e0
diff --cc drivers/media/IR/lirc_dev.c
index 202581808bd,3ef15625fa8..8418b14ee4d
--- a/drivers/media/IR/lirc_dev.c
+++ b/drivers/media/IR/lirc_dev.c
@@@ -160,9 -158,11 +157,12 @@@ static struct file_operations lirc_dev_
  	.write		= lirc_dev_fop_write,
  	.poll		= lirc_dev_fop_poll,
  	.unlocked_ioctl	= lirc_dev_fop_ioctl,
+ #ifdef CONFIG_COMPAT
+ 	.compat_ioctl	= lirc_dev_fop_ioctl,
+ #endif
  	.open		= lirc_dev_fop_open,
  	.release	= lirc_dev_fop_close,
 +	.llseek		= noop_llseek,
  };
  
  static int lirc_cdev_add(struct irctl *ir)
diff --cc drivers/staging/go7007/Kconfig
index 75fa4680552,b816a6045d0..3aecd30f0d1
--- a/drivers/staging/go7007/Kconfig
+++ b/drivers/staging/go7007/Kconfig
@@@ -1,10 -1,9 +1,10 @@@
  config VIDEO_GO7007
  	tristate "WIS GO7007 MPEG encoder support"
  	depends on VIDEO_DEV && PCI && I2C && INPUT
 +	depends on BKL # please fix
  	depends on SND
  	select VIDEOBUF_DMA_SG
- 	select VIDEO_IR
+ 	depends on VIDEO_IR
  	select VIDEO_TUNER
  	select VIDEO_TVEEPROM
  	select SND_PCM
diff --cc drivers/staging/lirc/lirc_it87.c
index 543c5c3bf90,20f02bc6236..929ae579546
--- a/drivers/staging/lirc/lirc_it87.c
+++ b/drivers/staging/lirc/lirc_it87.c
@@@ -340,9 -339,11 +339,12 @@@ static const struct file_operations lir
  	.write		= lirc_write,
  	.poll		= lirc_poll,
  	.unlocked_ioctl	= lirc_ioctl,
+ #ifdef CONFIG_COMPAT
+ 	.compat_ioctl	= lirc_ioctl,
+ #endif
  	.open		= lirc_open,
  	.release	= lirc_close,
 +	.llseek		= noop_llseek,
  };
  
  static int set_use_inc(void *data)
diff --cc drivers/staging/lirc/lirc_sir.c
index 2478871bd95,c4cb3aa842d..c553ab62623
--- a/drivers/staging/lirc/lirc_sir.c
+++ b/drivers/staging/lirc/lirc_sir.c
@@@ -457,9 -456,11 +456,12 @@@ static const struct file_operations lir
  	.write		= lirc_write,
  	.poll		= lirc_poll,
  	.unlocked_ioctl	= lirc_ioctl,
+ #ifdef CONFIG_COMPAT
+ 	.compat_ioctl	= lirc_ioctl,
+ #endif
  	.open		= lirc_dev_fop_open,
  	.release	= lirc_dev_fop_close,
 +	.llseek		= no_llseek,
  };
  
  static int set_use_inc(void *data)