From: Marc Fiuczynski Date: Wed, 10 Jan 2007 15:25:47 +0000 (+0000) Subject: BUILTIN -> DISABLE : CONFIG_INPUT_MOUSE X-Git-Tag: before-vanilla-2_6_16_38-vs2_0_3_rc1-merge~7 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2ea119425cd2aa4d5e8024122c260817a358038c;p=linux-2.6.git BUILTIN -> DISABLE : CONFIG_INPUT_MOUSE MODULE -> DISABLE : CONFIG_I2C MODULE -> DISABLE : CONFIG_VIDEO_DEV BUILTIN -> REMOVED : CONFIG_MOUSE_PS2 DISABLE -> REMOVED : CONFIG_MOUSE_SERIAL DISABLE -> REMOVED : CONFIG_MOUSE_VSXXXAA DISABLE -> REMOVED : CONFIG_I2C_CHARDEV MODULE -> REMOVED : CONFIG_I2C_ALGOBIT DISABLE -> REMOVED : CONFIG_I2C_ALGOPCF DISABLE -> REMOVED : CONFIG_I2C_ALGOPCA DISABLE -> REMOVED : CONFIG_I2C_ALI1535 DISABLE -> REMOVED : CONFIG_I2C_ALI1563 DISABLE -> REMOVED : CONFIG_I2C_ALI15X3 DISABLE -> REMOVED : CONFIG_I2C_AMD756 DISABLE -> REMOVED : CONFIG_I2C_AMD8111 DISABLE -> REMOVED : CONFIG_I2C_I801 DISABLE -> REMOVED : CONFIG_I2C_I810 DISABLE -> REMOVED : CONFIG_I2C_PIIX4 DISABLE -> REMOVED : CONFIG_I2C_NFORCE2 DISABLE -> REMOVED : CONFIG_I2C_PARPORT_LIGHT DISABLE -> REMOVED : CONFIG_I2C_PROSAVAGE DISABLE -> REMOVED : CONFIG_I2C_SAVAGE4 DISABLE -> REMOVED : CONFIG_SCx200_ACB DISABLE -> REMOVED : CONFIG_I2C_SIS5595 DISABLE -> REMOVED : CONFIG_I2C_SIS630 DISABLE -> REMOVED : CONFIG_I2C_SIS96X DISABLE -> REMOVED : CONFIG_I2C_STUB DISABLE -> REMOVED : CONFIG_I2C_VIA DISABLE -> REMOVED : CONFIG_I2C_VIAPRO DISABLE -> REMOVED : CONFIG_I2C_VOODOO3 DISABLE -> REMOVED : CONFIG_I2C_PCA_ISA DISABLE -> REMOVED : CONFIG_SENSORS_DS1337 DISABLE -> REMOVED : CONFIG_SENSORS_DS1374 DISABLE -> REMOVED : CONFIG_SENSORS_EEPROM DISABLE -> REMOVED : CONFIG_SENSORS_PCF8574 DISABLE -> REMOVED : CONFIG_SENSORS_PCA9539 DISABLE -> REMOVED : CONFIG_SENSORS_PCF8591 DISABLE -> REMOVED : CONFIG_SENSORS_MAX6875 DISABLE -> REMOVED : CONFIG_I2C_DEBUG_CORE DISABLE -> REMOVED : CONFIG_I2C_DEBUG_ALGO DISABLE -> REMOVED : CONFIG_I2C_DEBUG_BUS DISABLE -> REMOVED : CONFIG_I2C_DEBUG_CHIP DISABLE -> REMOVED : CONFIG_VIDEO_V4L1 DISABLE -> REMOVED : CONFIG_VIDEO_V4L1_COMPAT DISABLE -> REMOVED : CONFIG_VIDEO_ADV_DEBUG DISABLE -> REMOVED : CONFIG_VIDEO_VIVI DISABLE -> REMOVED : CONFIG_VIDEO_BT848 DISABLE -> REMOVED : CONFIG_VIDEO_CPIA2 DISABLE -> REMOVED : CONFIG_VIDEO_SAA5249 DISABLE -> REMOVED : CONFIG_TUNER_3036 DISABLE -> REMOVED : CONFIG_VIDEO_SAA7134 DISABLE -> REMOVED : CONFIG_VIDEO_CX88 DISABLE -> REMOVED : CONFIG_VIDEO_MSP3400 DISABLE -> REMOVED : CONFIG_VIDEO_CS53L32A DISABLE -> REMOVED : CONFIG_VIDEO_WM8775 DISABLE -> REMOVED : CONFIG_VIDEO_WM8739 DISABLE -> REMOVED : CONFIG_VIDEO_CX25840 DISABLE -> REMOVED : CONFIG_VIDEO_SAA711X DISABLE -> REMOVED : CONFIG_VIDEO_SAA7127 DISABLE -> REMOVED : CONFIG_VIDEO_UPD64031A DISABLE -> REMOVED : CONFIG_VIDEO_UPD64083 --- diff --git a/configs/kernel-2.6.17-i586-planetlab.config b/configs/kernel-2.6.17-i586-planetlab.config index 3d426c77f..ca63110a6 100644 --- a/configs/kernel-2.6.17-i586-planetlab.config +++ b/configs/kernel-2.6.17-i586-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-1.2187_FC5.10 -# Mon Jan 8 14:12:33 2007 +# Linux kernel version: 2.6.17xxx +# Wed Jan 10 15:19:28 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -990,10 +990,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -1081,55 +1078,7 @@ CONFIG_HANGCHECK_TIMER=y # # I2C support # -CONFIG_I2C=m -# CONFIG_I2C_CHARDEV is not set - -# -# I2C Algorithms -# -CONFIG_I2C_ALGOBIT=m -# CONFIG_I2C_ALGOPCF is not set -# CONFIG_I2C_ALGOPCA is not set - -# -# I2C Hardware Bus support -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_I801 is not set -# CONFIG_I2C_I810 is not set -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PROSAVAGE is not set -# CONFIG_I2C_SAVAGE4 is not set -# CONFIG_SCx200_ACB is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set -# CONFIG_I2C_VOODOO3 is not set -# CONFIG_I2C_PCA_ISA is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set +# CONFIG_I2C is not set # # SPI support @@ -1156,48 +1105,9 @@ CONFIG_I2C_ALGOBIT=m # # Multimedia devices # -CONFIG_VIDEO_DEV=m -# CONFIG_VIDEO_V4L1 is not set -# CONFIG_VIDEO_V4L1_COMPAT is not set +# CONFIG_VIDEO_DEV is not set CONFIG_VIDEO_V4L2=y -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_VIVI is not set -# CONFIG_VIDEO_BT848 is not set -# CONFIG_VIDEO_CPIA2 is not set -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_SAA7134 is not set -# CONFIG_VIDEO_CX88 is not set - -# -# Encoders and Decoders -# -# CONFIG_VIDEO_MSP3400 is not set -# CONFIG_VIDEO_CS53L32A is not set -# CONFIG_VIDEO_WM8775 is not set -# CONFIG_VIDEO_WM8739 is not set -# CONFIG_VIDEO_CX25840 is not set -# CONFIG_VIDEO_SAA711X is not set -# CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_UPD64031A is not set -# CONFIG_VIDEO_UPD64083 is not set - -# -# V4L USB devices -# - -# -# Radio Adapters -# - # # Digital Video Broadcasting Devices # diff --git a/configs/kernel-2.6.17-i686-planetlab.config b/configs/kernel-2.6.17-i686-planetlab.config index 5be07aac6..330a1965c 100644 --- a/configs/kernel-2.6.17-i686-planetlab.config +++ b/configs/kernel-2.6.17-i686-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-1.2187_FC5.0smp -# Mon Jan 8 13:48:19 2007 +# Linux kernel version: 2.6.17xxx +# Wed Jan 10 15:20:22 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -995,10 +995,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set diff --git a/configs/kernel-2.6.17-i686-smp-planetlab.config b/configs/kernel-2.6.17-i686-smp-planetlab.config index 0d1e3b0ad..71aa5174d 100644 --- a/configs/kernel-2.6.17-i686-smp-planetlab.config +++ b/configs/kernel-2.6.17-i686-smp-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-1.2187_FC5.0smp -# Mon Jan 8 13:51:49 2007 +# Linux kernel version: 2.6.17xxx +# Wed Jan 10 15:20:53 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -1002,10 +1002,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set diff --git a/configs/kernel-2.6.17-i686-uml-planetlab.config b/configs/kernel-2.6.17-i686-uml-planetlab.config index 6d240f130..baa9c8ad0 100644 --- a/configs/kernel-2.6.17-i686-uml-planetlab.config +++ b/configs/kernel-2.6.17-i686-uml-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-1.2187_FC5.0smp -# Mon Jan 8 14:00:52 2007 +# Linux kernel version: 2.6.17xxx +# Wed Jan 10 15:23:52 2007 # CONFIG_GENERIC_HARDIRQS=y CONFIG_UML=y diff --git a/configs/kernel-2.6.17-i686-xenU-planetlab.config b/configs/kernel-2.6.17-i686-xenU-planetlab.config index b0377a2b2..497899bf4 100644 --- a/configs/kernel-2.6.17-i686-xenU-planetlab.config +++ b/configs/kernel-2.6.17-i686-xenU-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-1.2187_FC5.0smp -# Mon Jan 8 13:53:01 2007 +# Linux kernel version: 2.6.17xxx +# Wed Jan 10 15:21:44 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y diff --git a/configs/kernel-2.6.18-i686-planetlab.config b/configs/kernel-2.6.18-i686-planetlab.config index 3fee07d5e..995b0919f 100644 --- a/configs/kernel-2.6.18-i686-planetlab.config +++ b/configs/kernel-2.6.18-i686-planetlab.config @@ -1200,7 +1200,7 @@ CONFIG_I2C_ALGOBIT=m CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_V4L1 is not set # CONFIG_VIDEO_V4L1_COMPAT is not set -CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L2=m # # Video Capture Adapters