git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
tosa.h
diff --git
a/arch/arm/mach-pxa/include/mach/tosa.h
b/arch/arm/mach-pxa/include/mach/tosa.h
index
4df2d38
..
1bbd1f2
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/tosa.h
+++ b/
arch/arm/mach-pxa/include/mach/tosa.h
@@
-167,7
+167,7
@@
#define TOSA_KEY_SYNC KEY_102ND /* ??? */
-#ifndef CONFIG_
KEYBOARD_
TOSA_USE_EXT_KEYCODES
+#ifndef CONFIG_TOSA_USE_EXT_KEYCODES
#define TOSA_KEY_RECORD KEY_YEN
#define TOSA_KEY_ADDRESSBOOK KEY_KATAKANA
#define TOSA_KEY_CANCEL KEY_ESC