openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/media/dvb/dvb-usb
History
Linus Torvalds 7a9b149212 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c
 		2010-05-20 21:26:12 -07:00
..
Kconfig V4L/DVB: AZ6027: Update Build 2010-02-26 15:10:59 -03:00
Makefile V4L/DVB: AZ6027: Update Build 2010-02-26 15:10:59 -03:00
a800.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
af9005-fe.c V4L/DVB (10248): v4l-dvb: fix a bunch of compile warnings. 2009-01-29 08:38:04 -02:00
af9005-remote.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
af9005-script.h V4L/DVB (8906): v4l-dvb: fix assorted sparse warnings 2008-10-12 09:36:58 -02:00
af9005.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
af9005.h V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
af9015.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
af9015.h V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
anysee.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
anysee.h V4L/DVB (8032): Anysee: fix Kconfig 2008-07-20 07:09:33 -03:00
au6610.c V4L/DVB (7952): AU6610: various cosmetic changes 2008-07-20 07:07:56 -03:00
au6610.h V4L/DVB (7952): AU6610: various cosmetic changes 2008-07-20 07:07:56 -03:00
az6027.c V4L/DVB: media/az6027: handle -EIO failure 2010-05-19 12:59:05 -03:00
az6027.h V4L/DVB: AZ6027: Fix checkpatch violations 2010-02-26 15:10:59 -03:00
ce6230.c V4L/DVB (13287): ce6230 - saa7164-cmd: Fix wrong sizeof 2009-11-07 12:55:13 -02:00
ce6230.h V4L/DVB (11216): Add driver for Intel CE6230 DVB-T USB2.0 2009-03-30 12:43:40 -03:00
cinergyT2-core.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
cinergyT2-fe.c V4L/DVB (12388): dvb-usb: fix tuning with Cinergy T2 2009-09-12 12:18:35 -03:00
cinergyT2.h V4L/DVB (9636): dvb: cinergyt2 annotate struct endianness, remove unused variable, add static 2008-12-29 17:53:34 -02:00
cxusb.c V4L/DVB: dib7000p: reduce large stack usage 2010-05-19 12:58:30 -03:00
cxusb.h V4L/DVB (8147): cxusb: add initial support for AVerTVHD Volar 2008-07-20 07:14:14 -03:00
dib07x0.h
…
dib0700.h V4L/DVB (13930): dib0700: rework IR logic for firmware 1.20 2010-02-26 15:10:32 -03:00
dib0700_core.c V4L/DVB: V4L: dvb-usb, add extra sync to down-up input events 2010-02-26 15:11:02 -03:00
dib0700_devices.c V4L/DVB: Add Elgato EyeTV Diversity to dibcom driver 2010-05-19 12:58:30 -03:00
dibusb-common.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
dibusb-mb.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
dibusb-mc.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
dibusb.h V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
digitv.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
digitv.h
…
dtt200u-fe.c
…
dtt200u.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
dtt200u.h
…
dtv5100.c V4L/DVB (8739): dtv5100: remove prohibited space... 2008-10-12 09:36:52 -02:00
dtv5100.h V4L/DVB (8738): dtv5100: remove old definition from header 2008-10-12 09:36:51 -02:00
dvb-usb-common.h V4L/DVB (7538): Adds selectable adapter numbers as per module option 2008-04-24 14:08:00 -03:00
dvb-usb-dvb.c V4L/DVB (13105): dvb-usb: add fe_ioctl_override callback to dvb_usb_adapter_properties 2009-12-05 18:40:22 -02:00
dvb-usb-firmware.c V4L/DVB (7971): usb: unaligned 2008-06-05 06:35:53 -03:00
dvb-usb-i2c.c V4L/DVB (12435): strlcpy() will always null terminate the string. 2009-09-12 12:18:50 -03:00
dvb-usb-ids.h V4L/DVB: Add Elgato EyeTV Diversity to dibcom driver 2010-05-19 12:58:30 -03:00
dvb-usb-init.c V4L/DVB: dvb: return -ENOMEM if kzalloc failed in dvb_usb_device_init() 2010-02-26 15:10:51 -03:00
dvb-usb-remote.c Input: scancode in get/set_keycodes should be unsigned 2010-03-08 23:19:15 -08:00
dvb-usb-urb.c V4L/DVB: dvb-usb: enable specifying a separate generic bulk ctrl response endpoint 2010-05-18 00:47:06 -03:00
dvb-usb.h V4L/DVB: dvb-usb: enable specifying a separate generic bulk ctrl response endpoint 2010-05-18 00:47:06 -03:00
dw2102.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
dw2102.h V4L/DVB (11981): Remote control debugging for dw2102 driver based USB cards 2009-06-16 19:07:46 -03:00
ec168.c V4L/DVB (13364): ec168: add new driver for E3C EC168 DVB USB 2009-12-05 18:41:33 -02: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 Fix typos in comments 2010-03-16 11:47:56 +01:00
friio.c V4L/DVB (13000): add driver for 774 Friio White USB ISDB-T receiver 2009-09-19 00:51:48 -03:00
friio.h V4L/DVB (13000): add driver for 774 Friio White USB ISDB-T receiver 2009-09-19 00:51:48 -03:00
gl861.c V4L/DVB (8014): gl861: coding style fixes 2008-07-20 07:08:55 -03:00
gl861.h V4L/DVB (8014): gl861: coding style fixes 2008-07-20 07:08:55 -03:00
gp8psk-fe.c Revert "V4L/DVB: Add FE_CAN_PSK_8 to allow apps to identify PSK_8 capable DVB devices" 2010-05-19 12:57:48 -03:00
gp8psk.c V4L/DVB: dvb-usb: gp8psk, fix potential null derefernce 2010-05-19 12:58:33 -03:00
gp8psk.h V4L/DVB (9928): Convert GP8PSK module to use S2API 2008-12-30 09:39:21 -02:00
m920x.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
m920x.h V4L/DVB: m920x: Add support for Pinnacle PCTV310e card 2010-02-26 15:10:51 -03:00
nova-t-usb2.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
opera1.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
ttusb2.c V4L/DVB (7654): tda10086: make the xtal frequency a configuration option 2008-04-24 14:09:44 -03:00
ttusb2.h
…
umt-010.c V4L/DVB (8042): DVB-USB UMT-010 channel scan oops 2008-06-26 15:58:51 -03:00
usb-urb.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
vp702x-fe.c V4L/DVB (7513): media/dvb/dvb-usb replace remaining __FUNCTION__ occurrences 2008-04-24 14:07:58 -03:00
vp702x.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
vp702x.h
…
vp7045-fe.c
…
vp7045.c V4L/DVB: rename all *_rc_keys to ir_codes_*_nec_table 2010-05-19 12:56:46 -03:00
vp7045.h
…