From eec050fe5a2b6967747c856873954a52e4f4bf54 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Fri, 16 Apr 2010 18:27:58 -0300 Subject: [PATCH] --- yaml --- r: 193004 b: refs/heads/master c: 1c0e0ee580c476234b5ea410f5263fcb27d96389 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/ir-core-priv.h | 7 ------- trunk/include/media/ir-core.h | 1 + 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d46f56debea5..af732f28eab3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d62e85a0949d2b899405a1ffbae06615227d4c97 +refs/heads/master: 1c0e0ee580c476234b5ea410f5263fcb27d96389 diff --git a/trunk/drivers/media/IR/ir-core-priv.h b/trunk/drivers/media/IR/ir-core-priv.h index fb2622a24ed8..8c1f84645eaf 100644 --- a/trunk/drivers/media/IR/ir-core-priv.h +++ b/trunk/drivers/media/IR/ir-core-priv.h @@ -57,13 +57,6 @@ struct ir_raw_event_ctrl { -DIV_ROUND_CLOSEST(abs((duration)), (unit_len)))) #define TO_US(duration) ((int)TO_UNITS(duration, 1000)) -/* - * Routines from ir-keytable.c to be used internally on ir-core and decoders - */ - -u32 ir_g_keycode_from_table(struct input_dev *input_dev, - u32 scancode); - /* * Routines from ir-sysfs.c - Meant to be called only internally inside * ir-core diff --git a/trunk/include/media/ir-core.h b/trunk/include/media/ir-core.h index ab3bd30d43f1..51e8eb3a3f2d 100644 --- a/trunk/include/media/ir-core.h +++ b/trunk/include/media/ir-core.h @@ -124,6 +124,7 @@ void ir_input_unregister(struct input_dev *input_dev); void ir_repeat(struct input_dev *dev); void ir_keydown(struct input_dev *dev, int scancode, u8 toggle); +u32 ir_g_keycode_from_table(struct input_dev *input_dev, u32 scancode); /* From ir-raw-event.c */