git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap-boards' into omap-for-linus
[safe/jmp/linux-2.6]
/
arch
/
arm
/
configs
/
ams_delta_defconfig
diff --git
a/arch/arm/configs/ams_delta_defconfig
b/arch/arm/configs/ams_delta_defconfig
index
1d0e892
..
6d8a0c8
100644
(file)
--- a/
arch/arm/configs/ams_delta_defconfig
+++ b/
arch/arm/configs/ams_delta_defconfig
@@
-699,6
+699,7
@@
CONFIG_SERIO=y
CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_AMS_DELTA=y
# CONFIG_GAMEPORT is not set
#