← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/media/video/tveeprom.c

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/tveeprom.c
286
286
        { TUNER_ABSENT,                 "MaxLinear 301"},
287
287
        { TUNER_ABSENT,                 "Mirics MSi001"},
288
288
        { TUNER_ABSENT,                 "MaxLinear MxL241SF"},
289
 
        { TUNER_ABSENT,                 "Xceive XC5000C"},
 
289
        { TUNER_XC5000C,                "Xceive XC5000C"},
290
290
        { TUNER_ABSENT,                 "Montage M68TS2020"},
 
291
        { TUNER_ABSENT,                 "Siano SMS1530"},
 
292
        { TUNER_ABSENT,                 "Dibcom 7090"},
 
293
        { TUNER_ABSENT,                 "Xceive XC5200C"},
 
294
        { TUNER_ABSENT,                 "NXP 18273"},
 
295
        { TUNER_ABSENT,                 "Montage M88TS2022"},
 
296
        /* 180-189 */
 
297
        { TUNER_ABSENT,                 "NXP 18272M"},
 
298
        { TUNER_ABSENT,                 "NXP 18272S"},
291
299
};
292
300
 
293
301
/* Use V4L2_IDENT_AMBIGUOUS for those audio 'chips' that are