aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2010-11-10 09:04:19 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:16:37 -0500
commit4c7b355df6e7f05304e05f6b7a286e59a5f1cc54 (patch)
treef098aab1e058de26013639a0d7924fdf30a86d7e /include
parent631493ecacd81f1af74de459c1d16f7ffa6c82c0 (diff)
[media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main
[mchehab@redhat.com: this patch were originally bundled with some renaming stuff and with the file merges, as seen at: https://patchwork.kernel.org/patch/291092/. Instead of using the original approach, I wrote the rename patches and the code merge as separate changes, then applied the difference on this patch. This way, it is easier to see the real changes at the code, and will be easier to merge upstream, especially if some conflict rises on the renaming patches] Signed-off-by: David Härdeman <david@hardeman.nu> Acked-by: Jarod Wilson <jarod@redhat.com> Tested-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/ir-core.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/ir-core.h b/include/media/ir-core.h
index 53048a2eefb9..d41502d9919c 100644
--- a/include/media/ir-core.h
+++ b/include/media/ir-core.h
@@ -117,7 +117,6 @@ enum raw_event_type {
117 117
118#define to_ir_input_dev(_attr) container_of(_attr, struct ir_input_dev, attr) 118#define to_ir_input_dev(_attr) container_of(_attr, struct ir_input_dev, attr)
119 119
120/* From ir-keytable.c */
121int __ir_input_register(struct input_dev *dev, 120int __ir_input_register(struct input_dev *dev,
122 const struct ir_scancode_table *ir_codes, 121 const struct ir_scancode_table *ir_codes,
123 struct ir_dev_props *props, 122 struct ir_dev_props *props,
@@ -164,7 +163,6 @@ void ir_keyup(struct input_dev *dev);
164u32 ir_g_keycode_from_table(struct input_dev *input_dev, u32 scancode); 163u32 ir_g_keycode_from_table(struct input_dev *input_dev, u32 scancode);
165 164
166/* From ir-raw-event.c */ 165/* From ir-raw-event.c */
167
168struct ir_raw_event { 166struct ir_raw_event {
169 union { 167 union {
170 u32 duration; 168 u32 duration;