aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-11-04 18:37:03 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-11-04 18:37:03 +0000
commit866dd2a3788f31c29c735c149d3e905ac2d37930 (patch)
treee453eeddf6132e3a87aaf81dfa33f5e561053993 /target/linux/x86
parentc30346c2e15312df7d03882cd507665100a6df16 (diff)
downloadupstream-866dd2a3788f31c29c735c149d3e905ac2d37930.tar.gz
upstream-866dd2a3788f31c29c735c149d3e905ac2d37930.tar.bz2
upstream-866dd2a3788f31c29c735c149d3e905ac2d37930.zip
kernel: refresh kernel configs with kconfig.pl
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 38642
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/generic/config-3.102
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/generic/config-3.10 b/target/linux/x86/generic/config-3.10
index aabeeee987..d85511c746 100644
--- a/target/linux/x86/generic/config-3.10
+++ b/target/linux/x86/generic/config-3.10
@@ -134,9 +134,9 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_MDA_CONSOLE is not set
# CONFIG_MIXCOMWD is not set
# CONFIG_MOUSE_BCM5974 is not set
+# CONFIG_MOUSE_CYAPA is not set
CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_PS2_ALPS=y
-# CONFIG_MOUSE_CYAPA is not set
# CONFIG_MOUSE_PS2_CYPRESS is not set
# CONFIG_MOUSE_PS2_ELANTECH is not set
CONFIG_MOUSE_PS2_LIFEBOOK=y