← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/media/v4l2-dev.h

  • 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:
include/media/v4l2-dev.h
62
62
        unsigned int (*poll) (struct file *, struct poll_table_struct *);
63
63
        long (*ioctl) (struct file *, unsigned int, unsigned long);
64
64
        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
 
65
#ifdef CONFIG_COMPAT
 
66
        long (*compat_ioctl32) (struct file *, unsigned int, unsigned long);
 
67
#endif
65
68
        unsigned long (*get_unmapped_area) (struct file *, unsigned long,
66
69
                                unsigned long, unsigned long, unsigned long);
67
70
        int (*mmap) (struct file *, struct vm_area_struct *);