leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64f3e70be6
linux/drivers/media/dvb/dvb-usb
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
a800.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
af9005-fe.c [media] af9005-fe: fix compiler warning 2011-09-06 14:43:59 -03:00
af9005-remote.c doc: fix broken references 2011-09-27 18:08:04 +02:00
af9005-script.h
af9005.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2011-10-31 15:42:54 -07:00
af9005.h [media] rc: Name RC keymap tables as rc_map_table 2010-12-29 08:16:51 -02:00
af9015.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
af9015.h [media] af9015: remove 2nd I2C-adapter 2011-07-27 17:55:58 -03:00
anysee.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
anysee.h [media] anysee: use multi-frontend (MFE) 2011-07-31 01:42:40 -03:00
au6610.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
au6610.h
az6027.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
az6027.h V4L/DVB: AZ6027: Fix checkpatch violations 2010-02-26 15:10:59 -03:00
ce6230.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
ce6230.h
cinergyT2-core.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
cinergyT2-fe.c
cinergyT2.h
cxusb.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
cxusb.h
dib07x0.h
dib0700_core.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
dib0700_devices.c [media] dib0700: fix ERROR: space required after that ',' 2011-09-21 10:05:34 -03:00
dib0700.h [media] DiB0700: get rid of on-stack dma buffers 2011-05-20 09:27:51 -03:00
dibusb-common.c [media] dibusb-common: fix ERROR: do not use assignment in if condition 2011-09-21 10:07:10 -03:00
dibusb-mb.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
dibusb-mc.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
dibusb.h [media] rc: Name RC keymap tables as rc_map_table 2010-12-29 08:16:51 -02:00
digitv.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
digitv.h
dtt200u-fe.c
dtt200u.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
dtt200u.h
dtv5100.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
dtv5100.h
dvb-usb-common.h
dvb-usb-dvb.c [media] dvb-usb-dvb: ERROR: space required after that ',' 2011-09-21 10:06:40 -03:00
dvb-usb-firmware.c
dvb-usb-i2c.c [media] i2c: Stop using I2C_CLASS_TV_DIGITAL 2010-10-21 07:54:26 -02:00
dvb-usb-ids.h [media] it913x [VER 1.07] Support for single ITE 9135 devices 2011-11-03 18:33:58 -02:00
dvb-usb-init.c [media] dvb-usb: refactor MFE code for individual streaming config per frontend 2011-09-06 14:21:42 -03:00
dvb-usb-remote.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
dvb-usb-urb.c [media] dvb-usb: refactor MFE code for individual streaming config per frontend 2011-09-06 14:21:42 -03:00
dvb-usb.h [media] dvb-usb: refactor MFE code for individual streaming config per frontend 2011-09-06 14:21:42 -03:00
dw2102.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
dw2102.h
ec168.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
ec168.h V4L/DVB (13364): ec168: add new driver for E3C EC168 DVB USB 2009-12-05 18:41:33 -02:00
friio-fe.c V4L/DVB: drivers/media: Make static data tables and strings const 2010-10-21 01:04:52 -02:00
friio.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
friio.h Fix common misspellings 2011-03-31 11:26:23 -03:00
gl861.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
gl861.h
gp8psk-fe.c [media] DVB: gp8psk-fe: use SYS_TURBO 2011-09-03 18:07:20 -03:00
gp8psk.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
gp8psk.h [media] Remove unused definitions which can cause conflict with definitions in usb/ch9.h 2011-07-27 17:52:59 -03:00
it913x.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
Kconfig [media] dvb: Add support for pctv452e 2011-09-24 00:07:42 -03:00
lmedm04.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
lmedm04.h [media] DM04/QQBOX v1.84 added PID filter 2011-05-20 09:28:36 -03:00
m920x.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
m920x.h V4L/DVB: m920x: Add support for Pinnacle PCTV310e card 2010-02-26 15:10:51 -03:00
Makefile [media] DVB: add MaxLinear MxL111SF DVB-T demodulator driver 2011-11-03 07:42:30 -02:00
mxl111sf-demod.c [media] mxl111sf: update demod_ops.info.name to "MaxLinear MxL111SF DVB-T demodulator" 2011-11-03 07:42:46 -02:00
mxl111sf-demod.h [media] DVB: add MaxLinear MxL111SF DVB-T demodulator driver 2011-11-03 07:42:30 -02:00
mxl111sf-gpio.c [media] dvb-usb: add ATSC support for the Hauppauge WinTV-Aero-M 2011-09-06 14:21:17 -03:00
mxl111sf-gpio.h [media] dvb-usb: add ATSC support for the Hauppauge WinTV-Aero-M 2011-09-06 14:21:17 -03:00
mxl111sf-i2c.c [media] mxl111sf: fix build warning 2011-11-07 13:37:43 -02:00
mxl111sf-i2c.h [media] dvb-usb: add ATSC support for the Hauppauge WinTV-Aero-M 2011-09-06 14:21:17 -03:00
mxl111sf-phy.c [media] mxl111sf: remove pointless if condition in mxl111sf_config_spi 2011-11-07 13:36:36 -02:00
mxl111sf-phy.h [media] dvb-usb: add ATSC support for the Hauppauge WinTV-Aero-M 2011-09-06 14:21:17 -03:00
mxl111sf-reg.h [media] dvb-usb: add ATSC support for the Hauppauge WinTV-Aero-M 2011-09-06 14:21:17 -03:00
mxl111sf-tuner.c [media] dvb-usb: add ATSC support for the Hauppauge WinTV-Aero-M 2011-09-06 14:21:17 -03:00
mxl111sf-tuner.h [media] dvb-usb: add ATSC support for the Hauppauge WinTV-Aero-M 2011-09-06 14:21:17 -03:00
mxl111sf.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
mxl111sf.h [media] DVB: add MaxLinear MxL111SF DVB-T demodulator driver 2011-11-03 07:42:30 -02:00
nova-t-usb2.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
opera1.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
pctv452e.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
technisat-usb2.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
ttusb2.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
ttusb2.h
umt-010.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
usb-urb.c [media] drivers/media/dvb/dvb-usb/usb-urb.c: adjust array index 2011-08-27 11:14:15 -03:00
vp702x-fe.c [media] vp702x: use preallocated buffer in the frontend 2011-05-20 09:28:14 -03:00
vp702x.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
vp702x.h [media] vp702x: remove unused variable 2011-05-20 09:28:07 -03:00
vp7045-fe.c
vp7045.c USB: convert drivers/media/* to use module_usb_driver() 2011-11-18 09:46:12 -08:00
vp7045.h [media] Remove unused definitions which can cause conflict with definitions in usb/ch9.h 2011-07-27 17:52:59 -03:00