projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patches_for_v3.6' into v4l_for_linus
[linux-2.6-microblaze.git]
/
include
/
media
/
gpio-ir-recv.h
diff --git
a/include/media/gpio-ir-recv.h
b/include/media/gpio-ir-recv.h
index
67797bf
..
0142736
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 {
#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__ */
};
#endif /* __GPIO_IR_RECV_H__ */