linux/drivers/staging/lirc, branch v2.6.37

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2010-10-28T19:13:00Z

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits) Staging: brcm80211: fix usage of roundup in structures Staging: bcm: fix up network device reference counting Staging: keucr: fix up US_ macro change staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. staging: brcm80211: Remove unnecessary header files. staging: brcm80211: Remove unnecessary includes from bcmutils.c staging: brcm80211: Removed unnecessary pktsetprio() function. Staging: brcm80211: remove typedefs.h Staging: brcm80211: remove uintptr typedef usage Staging: hv: remove struct vmbus_channel_interface Staging: hv: remove Open from struct vmbus_channel_interface Staging: hv: storvsc: call vmbus_open directly Staging: hv: netvsc: call vmbus_open directly Staging: hv: channel: export vmbus_open to modules Staging: hv: remove Close from struct vmbus_channel_interface Staging: hv: netvsc: call vmbus_close directly Staging: hv: storvsc: call vmbus_close directly Staging: hv: channel: export vmbus_close to modules Staging: hv: remove SendPacket from struct vmbus_channel_interface Staging: hv: storvsc: call vmbus_sendpacket directly ... Fix up conflicts in drivers/staging/cx25821/cx25821-audio-upstream.c drivers/staging/cx25821/cx25821-audio.h due to warring whitespace cleanups (neither of which were all that great)

Merge 'staging-next' to Linus's tree

2010-10-28T16:44:56Z

This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman

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

2010-10-28T16:35:11Z

* '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 ...

[media] lirc_it87: add another pnp id

2010-10-22T22:05:37Z

Jochen Kühner reports lirc_it87 works with his hardware with this device ID. Tested-by: Jochen Kühner Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] lirc_igorplugusb: add Fit PC2 device ID

2010-10-22T22:05:37Z

Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] lirc_igorplugusb: handle hw buffer overruns better

2010-10-22T22:05:37Z

Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] lirc_igorplugusb: assorted fixups

2010-10-22T22:05:36Z

Tighten up error checking, rename some functions to less generic names, remove unnecessary cruft, add missing debug modparam wiring, and fix up some printk output. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] lirc_parallel: build on smp and kill dead code

2010-10-22T22:05:36Z

Talked to Christoph Bartelmus about this a bit, and he says this driver actually *should* work okay on CONFIG_SMP, the check was a legacy one from the very early days of SMP support before it had stabilized (yes, this driver is that ancient). Also remove some completely unused code, only noticed after building this driver for the first time in an eternity (on an SMP host now, of course). Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] lirc: wire up .compat_ioctl to main ioctl handler

2010-10-21T03:18:36Z

As pointed out (and tested) by Joris van Rantwijk, we do actually need to wire up .compat_ioctl for 32-bit lirc userspace to work with 64-bit lirc kernelspace. Do it. And add a check to make sure we get a valid irctl in the ioctl handler. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab

[media] staging/lirc: ioctl portability fixups

2010-10-21T03:18:35Z

Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab