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
/
asm-h8300
/
keyboard.h
diff --git
a/include/asm-h8300/keyboard.h
b/include/asm-h8300/keyboard.h
index
b05d113
..
90efbd6
100644
(file)
--- a/
include/asm-h8300/keyboard.h
+++ b/
include/asm-h8300/keyboard.h
@@
-7,7
+7,6
@@
#ifndef _H8300_KEYBOARD_H
#define _H8300_KEYBOARD_H
#ifndef _H8300_KEYBOARD_H
#define _H8300_KEYBOARD_H
-#include <linux/config.h>
/* dummy i.e. no real keyboard */
#define kbd_setkeycode(x...) (-ENOSYS)
/* dummy i.e. no real keyboard */
#define kbd_setkeycode(x...) (-ENOSYS)
@@
-19,14
+18,6
@@
#define kbd_enable_irq(x...) do {;} while (0)
#define kbd_disable_irq(x...) do {;} while (0)
#define kbd_enable_irq(x...) do {;} while (0)
#define kbd_disable_irq(x...) do {;} while (0)
-
-/* needed if MAGIC_SYSRQ is enabled for serial console */
-#ifndef SYSRQ_KEY
-#define SYSRQ_KEY ((unsigned char)(-1))
-#define kbd_sysrq_xlate ((unsigned char *)NULL)
-#endif
-
-
#endif /* _H8300_KEYBOARD_H */
#endif /* _H8300_KEYBOARD_H */