Merge tag 'v3.12'

Linux 3.12

Conflicts:
	fs/exec.c

1 files changed, 1 insertions, 0 deletions

diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
index 168dd0b1bae2..78f0637ca68d 100644
--- a/include/media/lirc_dev.h
+++ b/include/media/lirc_dev.h
@@ -139,6 +139,7 @@ struct lirc_driver {
         struct lirc_buffer *rbuf;
         int (*set_use_inc) (void *data);
         void (*set_use_dec) (void *data);
+        struct rc_dev *rdev;
         const struct file_operations *fops;
         struct device *dev;
         struct module *owner;