From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jan 2012 20:53:54 +0000 (-0800)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4a7c1ff2362b7bfbc04990f42c21cefdff57f997;p=~shefty%2Frdma-dev.git

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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits)
  [media] as3645a: Fix compilation by including slab.h
  [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c
  [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c
  [media] ds3000: using logical && instead of bitwise &
  [media] v4l2-ctrls: make control names consistent
  [media] DVB: dib0700, add support for Nova-TD LEDs
  [media] DVB: dib0700, add corrected Nova-TD frontend_attach
  [media] DVB: dib0700, separate stk7070pd initialization
  [media] DVB: dib0700, move Nova-TD Stick to a separate set
  [media] : add MODULE_FIRMWARE to dib0700
  [media] DVB-CORE: remove superfluous DTV_CMDs
  [media] s5p-jpeg: adapt to recent videobuf2 changes
  [media] s5p-g2d: fixed a bug in controls setting function
  [media] s5p-mfc: Fix volatile controls setup
  [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test
  [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test
  [media] s5p-fimc: Fix incorrect control ID assignment
  [media] dvb_frontend: Don't call get_frontend() if idle
  [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T
  [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters
  ...
---

4a7c1ff2362b7bfbc04990f42c21cefdff57f997
diff --cc drivers/media/dvb/dvb-usb/dib0700_core.c
index 206999476f0,2d259ca34b0..070e82aa53f
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@@ -832,8 -832,29 +832,9 @@@ static struct usb_driver dib0700_drive
  	.id_table   = dib0700_usb_id_table,
  };
  
 -/* module stuff */
 -static int __init dib0700_module_init(void)
 -{
 -	int result;
 -	info("loaded with support for %d different device-types", dib0700_device_count);
 -	if ((result = usb_register(&dib0700_driver))) {
 -		err("usb_register failed. Error number %d",result);
 -		return result;
 -	}
 -
 -	return 0;
 -}
 -
 -static void __exit dib0700_module_exit(void)
 -{
 -	/* deregister this driver from the USB subsystem */
 -	usb_deregister(&dib0700_driver);
 -}
 -
 -module_init (dib0700_module_init);
 -module_exit (dib0700_module_exit);
 +module_usb_driver(dib0700_driver);
  
+ MODULE_FIRMWARE("dvb-usb-dib0700-1.20.fw");
  MODULE_AUTHOR("Patrick Boettcher <pboettcher@dibcom.fr>");
  MODULE_DESCRIPTION("Driver for devices based on DiBcom DiB0700 - USB bridge");
  MODULE_VERSION("1.0");