git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
media
/
ir-kbd-i2c.h
diff --git
a/include/media/ir-kbd-i2c.h
b/include/media/ir-kbd-i2c.h
index
730f21e
..
a455f7c
100644
(file)
--- a/
include/media/ir-kbd-i2c.h
+++ b/
include/media/ir-kbd-i2c.h
@@
-20,5
+20,6
@@
struct IR_i2c {
int (*get_key)(struct IR_i2c*, u32*, u32*);
};
int (*get_key)(struct IR_i2c*, u32*, u32*);
};
-int get_key_pinnacle(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw);
+int get_key_pinnacle_grey(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw);
+int get_key_pinnacle_color(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw);
#endif
#endif