Merge branch 'patches_for_v3.6' into v4l_for_linus

[karo-tx-linux.git] / include / media / gpio-ir-recv.h

diff --git a/include/media/gpio-ir-recv.h b/include/media/gpio-ir-recv.h
index 67797bf5d432f6a648961c742d70ed1d008d0199..0142736a59db86a3dff4c9592793c6f6f6193e72 100644 (file)
--- a/include/media/gpio-ir-recv.h
+++ b/include/media/gpio-ir-recv.h
@@ -14,8 +14,10 @@
 #define __GPIO_IR_RECV_H__
 
 struct gpio_ir_recv_platform_data {
-       int gpio_nr;
-       bool active_low;
+       int             gpio_nr;
+       bool            active_low;
+       u64             allowed_protos;
+       const char      *map_name;
 };
 
 #endif /* __GPIO_IR_RECV_H__ */