sync the x86-2.6 config with the brcm-2.6 one

SVN-Revision: 2324
This commit is contained in:
Nicolas Thill 2005-11-03 04:44:07 +00:00
parent 78334a8e3d
commit 695b815646

View File

@ -559,7 +559,7 @@ CONFIG_NET_IPGRE=m
# CONFIG_INET_AH is not set # CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set # CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP 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_IPSEC_NAT_TRAVERSAL=y
# CONFIG_IP_TCPDIAG is not set # CONFIG_IP_TCPDIAG is not set
# CONFIG_IP_TCPDIAG_IPV6 is not set # CONFIG_IP_TCPDIAG_IPV6 is not set
@ -995,24 +995,16 @@ CONFIG_INPUT=m
# #
# Userland interfaces # Userland interfaces
# #
CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV 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 # CONFIG_INPUT_EVBUG is not set
# #
# Input Device Drivers # Input Device Drivers
# #
CONFIG_INPUT_KEYBOARD=y # CONFIG_INPUT_KEYBOARD is not set
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_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_TOUCHSCREEN is not set
@ -1021,13 +1013,7 @@ CONFIG_KEYBOARD_ATKBD=m
# #
# Hardware I/O ports # Hardware I/O ports
# #
CONFIG_SERIO=y # CONFIG_SERIO is not set
# 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_GAMEPORT 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_SE401 is not set
# CONFIG_USB_SN9C102 is not set # CONFIG_USB_SN9C102 is not set
# CONFIG_USB_STV680 is not set # CONFIG_USB_STV680 is not set
# CONFIG_USB_PWC is not set CONFIG_USB_PWC=m
# #
# USB Network Adapters # USB Network Adapters
@ -1510,7 +1496,7 @@ CONFIG_USB_STORAGE_DEBUG=y
# CONFIG_USB_RTL8150 is not set # CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set # CONFIG_USB_USBNET is not set
# CONFIG_USB_ZD1201 is not set # CONFIG_USB_ZD1201 is not set
# CONFIG_USB_MON is not set CONFIG_USB_MON=m
# #
# USB port drivers # USB port drivers