aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/keyboard.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/keyboard.c')
-rw-r--r--drivers/char/keyboard.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index fc54d234507a..4dbd3425e928 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -38,7 +38,6 @@
38#include <linux/kbd_kern.h> 38#include <linux/kbd_kern.h>
39#include <linux/kbd_diacr.h> 39#include <linux/kbd_diacr.h>
40#include <linux/vt_kern.h> 40#include <linux/vt_kern.h>
41#include <linux/consolemap.h>
42#include <linux/sysrq.h> 41#include <linux/sysrq.h>
43#include <linux/input.h> 42#include <linux/input.h>
44#include <linux/reboot.h> 43#include <linux/reboot.h>
@@ -194,7 +193,7 @@ int getkeycode(unsigned int scancode)
194 int error = -ENODEV; 193 int error = -ENODEV;
195 194
196 list_for_each_entry(handle, &kbd_handler.h_list, h_node) { 195 list_for_each_entry(handle, &kbd_handler.h_list, h_node) {
197 error = handle->dev->getkeycode(handle->dev, scancode, &keycode); 196 error = input_get_keycode(handle->dev, scancode, &keycode);
198 if (!error) 197 if (!error)
199 return keycode; 198 return keycode;
200 } 199 }
@@ -208,7 +207,7 @@ int setkeycode(unsigned int scancode, unsigned int keycode)
208 int error = -ENODEV; 207 int error = -ENODEV;
209 208
210 list_for_each_entry(handle, &kbd_handler.h_list, h_node) { 209 list_for_each_entry(handle, &kbd_handler.h_list, h_node) {
211 error = handle->dev->setkeycode(handle->dev, scancode, keycode); 210 error = input_set_keycode(handle->dev, scancode, keycode);
212 if (!error) 211 if (!error)
213 break; 212 break;
214 } 213 }