From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2011 17:14:22 +0000 (-0700)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v3.0-rc1~47
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=c0880dcded3ffe77700184e9d96c110ce0094c11;hp=-c

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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote
  [media] Add missing include guard to header file
  [media] Inlined functions should be static
  [media] Remove invalid parameter description
  [media] cpia2: fix warning about invalid trigraph sequence
  [media] s5p-csis: Add missing dependency on PLAT_S5P
  [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG
  [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function
  [media] uvcvideo: Connect video devices to media entities
  [media] uvcvideo: Register subdevices for each entity
  [media] uvcvideo: Register a v4l2_device
  [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook
  [media] Documentation/DocBook: Rename media fops xml files
  [media] Media DocBook: fix validation errors
  [media] wl12xx: g_volatile_ctrl fix: wrong field set
  [media] fix kconfig dependency warning for VIDEO_TIMBERDALE
  [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked
  [media] Add support for M-5MOLS 8 Mega Pixel camera ISP
---

c0880dcded3ffe77700184e9d96c110ce0094c11
diff --combined drivers/media/radio/radio-wl1273.c
index 46cacf845049,9dbbd31b5ba2..459f7272d326
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@@ -1382,7 -1382,7 +1382,7 @@@ static int wl1273_fm_g_volatile_ctrl(st
  
  	switch (ctrl->id) {
  	case  V4L2_CID_TUNE_ANTENNA_CAPACITOR:
- 		ctrl->val = wl1273_fm_get_tx_ctune(radio);
+ 		ctrl->cur.val = wl1273_fm_get_tx_ctune(radio);
  		break;
  
  	default:
@@@ -1990,7 -1990,7 +1990,7 @@@ static int wl1273_fm_radio_remove(struc
  
  static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev)
  {
 -	struct wl1273_core **core = mfd_get_data(pdev);
 +	struct wl1273_core **core = pdev->dev.platform_data;
  	struct wl1273_device *radio;
  	struct v4l2_ctrl *ctrl;
  	int r = 0;