summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorDu, Changbin <changbin.du@gmail.com>2012-07-03 06:27:19 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 18:21:53 -0300
commit500c3201e2aed201f2de0468dfeb3ceb98a9f981 (patch)
treea0fa37f2603851bdc8c7249b6d2ffde39b369fad /include/media
parent87e9429490dfe610faaf209795942272bc7a730a (diff)
downloadlinux-3.10-500c3201e2aed201f2de0468dfeb3ceb98a9f981.tar.gz
linux-3.10-500c3201e2aed201f2de0468dfeb3ceb98a9f981.tar.bz2
linux-3.10-500c3201e2aed201f2de0468dfeb3ceb98a9f981.zip
[media] media: gpio-ir-recv: add allowed_protos for platform data
It's better to give platform code a chance to specify the allowed protocols to use. [mchehab@redhat.com: fix merge conflict with a patch that made half of this change] Signed-off-by: Du, Changbin <changbin.du@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/gpio-ir-recv.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/media/gpio-ir-recv.h b/include/media/gpio-ir-recv.h
index 91546f35b7e..0142736a59d 100644
--- a/include/media/gpio-ir-recv.h
+++ b/include/media/gpio-ir-recv.h
@@ -14,9 +14,10 @@
#define __GPIO_IR_RECV_H__
struct gpio_ir_recv_platform_data {
- int gpio_nr;
- bool active_low;
- const char *map_name;
+ int gpio_nr;
+ bool active_low;
+ u64 allowed_protos;
+ const char *map_name;
};
#endif /* __GPIO_IR_RECV_H__ */