Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / include / keyboard.h

diff --git a/include/keyboard.h b/include/keyboard.h
index 5cbd9f8ba8918e6087f121c1167ce5e3be452d62..7561954f755d727545705354fd09dec5a6f06693 100644 (file)
--- a/include/keyboard.h
+++ b/include/keyboard.h
@@ -1,7 +1,6 @@
 #ifndef __KEYBOARD_H
 #define __KEYBOARD_H
 
-#ifdef CONFIG_DM_KEYBOARD
 #include <input.h>
 #include <stdio_dev.h>
 
@@ -77,30 +76,4 @@ struct keyboard_ops {
 
 #define keyboard_get_ops(dev)  ((struct keyboard_ops *)(dev)->driver->ops)
 
-#else
-
-#ifdef CONFIG_PS2MULT
-#include <ps2mult.h>
-#endif
-
-#if !defined(kbd_request_region) || \
-    !defined(kbd_request_irq) || \
-    !defined(kbd_read_input) || \
-    !defined(kbd_read_status) || \
-    !defined(kbd_write_output) || \
-    !defined(kbd_write_command)
-#error PS/2 low level routines not defined
-#endif
-
-extern int kbd_init (void);
-extern void handle_scancode(unsigned char scancode);
-extern int kbd_init_hw(void);
-extern void pckbd_leds(unsigned char leds);
-#endif /* !CONFIG_DM_KEYBOARD */
-
-#if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \
-               defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555)
-int ps2ser_check(void);
-#endif
-
 #endif /* __KEYBOARD_H */