Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
Linus Torvalds [Thu, 28 Oct 2010 16:35:11 +0000 (09:35 -0700)]
* '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
  ...

32 files changed:
1  2 
Documentation/devices.txt
Documentation/feature-removal-schedule.txt
arch/arm/mach-mx3/mach-pcm037.c
arch/arm/mach-pxa/em-x270.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/mioa701.c
arch/sh/boards/mach-ecovec24/setup.c
drivers/media/IR/imon.c
drivers/media/IR/ir-keytable.c
drivers/media/IR/ir-lirc-codec.c
drivers/media/IR/lirc_dev.c
drivers/media/dvb/dvb-core/dvb_frontend.c
drivers/media/dvb/ttpci/av7110.c
drivers/media/dvb/ttpci/av7110_av.c
drivers/media/dvb/ttpci/budget-core.c
drivers/media/video/Kconfig
drivers/media/video/cafe_ccic.c
drivers/media/video/cx23885/cx23885-417.c
drivers/media/video/cx88/cx88-blackbird.c
drivers/media/video/mxb.c
drivers/media/video/zoran/zoran_driver.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cx25821/Kconfig
drivers/staging/go7007/Kconfig
drivers/staging/lirc/lirc_it87.c
drivers/staging/lirc/lirc_serial.c
drivers/staging/lirc/lirc_sir.c
drivers/video/via/accel.c
drivers/video/via/via-core.c
include/linux/Kbuild
include/media/rc-map.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
@@@ -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)
Simple merge
@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge