diff options
| author | Nicolas Thill <nico@openwrt.org> | 2005-11-03 04:44:07 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2005-11-03 04:44:07 +0000 |
| commit | 8c6d36683bda079afd4a3e2990116b3af8da8bd4 (patch) | |
| tree | 5a3e231a1f585e43fdfaed906323c8651098bada | |
| parent | fecc0ab980187c502b1a9ff61d6a55a6ab02ff4c (diff) | |
| download | upstream-8c6d36683bda079afd4a3e2990116b3af8da8bd4.tar.gz upstream-8c6d36683bda079afd4a3e2990116b3af8da8bd4.tar.bz2 upstream-8c6d36683bda079afd4a3e2990116b3af8da8bd4.zip | |
sync the x86-2.6 config with the brcm-2.6 one
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2324 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/linux-2.6/config/x86 | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/target/linux/linux-2.6/config/x86 b/target/linux/linux-2.6/config/x86 index 8fa00466be..4d8c8a746d 100644 --- a/target/linux/linux-2.6/config/x86 +++ b/target/linux/linux-2.6/config/x86 @@ -559,7 +559,7 @@ CONFIG_NET_IPGRE=m # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set -# CONFIG_INET_TUNNEL is not set +CONFIG_INET_TUNNEL=m CONFIG_IPSEC_NAT_TRAVERSAL=y # CONFIG_IP_TCPDIAG is not set # CONFIG_IP_TCPDIAG_IPV6 is not set @@ -995,24 +995,16 @@ CONFIG_INPUT=m # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=m -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=m # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=m -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -1021,13 +1013,7 @@ CONFIG_KEYBOARD_ATKBD=m # # Hardware I/O ports # -CONFIG_SERIO=y -# CONFIG_SERIO_I8042 is not set -CONFIG_SERIO_SERPORT=y -# CONFIG_SERIO_CT82C710 is not set -# CONFIG_SERIO_PCIPS2 is not set -CONFIG_SERIO_LIBPS2=m -# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO is not set # CONFIG_GAMEPORT is not set # @@ -1499,7 +1485,7 @@ CONFIG_USB_STORAGE_DEBUG=y # CONFIG_USB_SE401 is not set # CONFIG_USB_SN9C102 is not set # CONFIG_USB_STV680 is not set -# CONFIG_USB_PWC is not set +CONFIG_USB_PWC=m # # USB Network Adapters @@ -1510,7 +1496,7 @@ CONFIG_USB_STORAGE_DEBUG=y # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set # CONFIG_USB_ZD1201 is not set -# CONFIG_USB_MON is not set +CONFIG_USB_MON=m # # USB port drivers |