← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/media/video/em28xx/em28xx-cards.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/em28xx/em28xx-cards.c
834
834
                .mts_firmware = 1,
835
835
                .has_dvb      = 1,
836
836
                .dvb_gpio     = hauppauge_wintv_hvr_900_digital,
837
 
                .ir_codes     = RC_MAP_HAUPPAUGE_NEW,
 
837
                .ir_codes     = RC_MAP_HAUPPAUGE,
838
838
                .decoder      = EM28XX_TVP5150,
839
839
                .input        = { {
840
840
                        .type     = EM28XX_VMUX_TELEVISION,
859
859
                .tuner_type   = TUNER_XC2028,
860
860
                .tuner_gpio   = default_tuner_gpio,
861
861
                .mts_firmware = 1,
862
 
                .ir_codes     = RC_MAP_HAUPPAUGE_NEW,
 
862
                .ir_codes     = RC_MAP_HAUPPAUGE,
863
863
                .decoder      = EM28XX_TVP5150,
864
864
                .input        = { {
865
865
                        .type     = EM28XX_VMUX_TELEVISION,
885
885
                .mts_firmware   = 1,
886
886
                .has_dvb        = 1,
887
887
                .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
888
 
                .ir_codes       = RC_MAP_HAUPPAUGE_NEW,
 
888
                .ir_codes       = RC_MAP_HAUPPAUGE,
889
889
                .decoder        = EM28XX_TVP5150,
890
890
                .input          = { {
891
891
                        .type     = EM28XX_VMUX_TELEVISION,
911
911
                .mts_firmware   = 1,
912
912
                .has_dvb        = 1,
913
913
                .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
914
 
                .ir_codes       = RC_MAP_RC5_HAUPPAUGE_NEW,
 
914
                .ir_codes       = RC_MAP_HAUPPAUGE,
915
915
                .decoder        = EM28XX_TVP5150,
916
916
                .input          = { {
917
917
                        .type     = EM28XX_VMUX_TELEVISION,
2430
2430
                dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
2431
2431
                break;
2432
2432
        case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
2433
 
                dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
 
2433
                dev->init_data.ir_codes = RC_MAP_HAUPPAUGE;
2434
2434
                dev->init_data.get_key = em28xx_get_key_em_haup;
2435
2435
                dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
2436
2436
                break;