Merge branch 'work.cramfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-bionic-kernel.git] / include / linux / parport.h

diff --git a/include/linux/parport.h b/include/linux/parport.h
index 58e3c64c6b4926b5f8734db2f2589780e66d3bc4..397607a0c0ebef2969a3c4ea81893be860c8aacc 100644 (file)
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -225,6 +225,7 @@ struct parport {
        struct pardevice *waittail;
 
        struct list_head list;
+       struct timer_list timer;
        unsigned int flags;
 
        void *sysctl_table;