[arm/iop32x, arm/ixp4xx] Don't build in KEYBOARD_ATKBD, MOUSE_PS2,
SERIO, JFFS2_FS, and CRAMFS. svn path=/dists/trunk/linux-2.6/; revision=12812
This commit is contained in:
parent
294e2ead98
commit
49d84f3a21
|
@ -74,6 +74,8 @@ linux-2.6 (2.6.28-1~experimental.1) UNRELEASED; urgency=low
|
|||
* [mipsel/r5k-cobalt] Enable INPUT_COBALT_BTNS.
|
||||
* [mipsel/r5k-cobalt] Enable the new Cobalt LCD driver (FB_COBALT).
|
||||
* [mips/r4k-ip22] Enable the new ALSA sound driver (SND_SGI_HAL2).
|
||||
* [arm/iop32x, arm/ixp4xx] Don't build in KEYBOARD_ATKBD, MOUSE_PS2,
|
||||
SERIO, JFFS2_FS, and CRAMFS.
|
||||
|
||||
[ Ian Campbell ]
|
||||
* [x86]: Enable Xen guest support in amd64 flavour. (closes: #495590)
|
||||
|
|
|
@ -305,7 +305,7 @@ CONFIG_INPUT_EVDEV=m
|
|||
## file: drivers/input/keyboard/Kconfig
|
||||
##
|
||||
CONFIG_INPUT_KEYBOARD=y
|
||||
CONFIG_KEYBOARD_ATKBD=y
|
||||
CONFIG_KEYBOARD_ATKBD=m
|
||||
# CONFIG_KEYBOARD_SUNKBD is not set
|
||||
# CONFIG_KEYBOARD_LKKBD is not set
|
||||
# CONFIG_KEYBOARD_XTKBD is not set
|
||||
|
@ -320,7 +320,7 @@ CONFIG_INPUT_UINPUT=m
|
|||
## file: drivers/input/mouse/Kconfig
|
||||
##
|
||||
CONFIG_INPUT_MOUSE=y
|
||||
CONFIG_MOUSE_PS2=y
|
||||
CONFIG_MOUSE_PS2=m
|
||||
# CONFIG_MOUSE_SERIAL is not set
|
||||
CONFIG_MOUSE_APPLETOUCH=m
|
||||
# CONFIG_MOUSE_VSXXXAA is not set
|
||||
|
@ -328,10 +328,10 @@ CONFIG_MOUSE_APPLETOUCH=m
|
|||
##
|
||||
## file: drivers/input/serio/Kconfig
|
||||
##
|
||||
CONFIG_SERIO=y
|
||||
CONFIG_SERIO_SERPORT=y
|
||||
CONFIG_SERIO=m
|
||||
CONFIG_SERIO_SERPORT=m
|
||||
# CONFIG_SERIO_PCIPS2 is not set
|
||||
CONFIG_SERIO_LIBPS2=y
|
||||
CONFIG_SERIO_LIBPS2=m
|
||||
# CONFIG_SERIO_RAW is not set
|
||||
|
||||
##
|
||||
|
@ -709,12 +709,6 @@ CONFIG_WATCHDOG=y
|
|||
# CONFIG_WDTPCI is not set
|
||||
# CONFIG_USBPCWATCHDOG is not set
|
||||
|
||||
##
|
||||
## file: fs/Kconfig
|
||||
##
|
||||
CONFIG_JFFS2_FS=y
|
||||
CONFIG_CRAMFS=y
|
||||
|
||||
##
|
||||
## file: fs/Kconfig.binfmt
|
||||
##
|
||||
|
|
|
@ -274,7 +274,7 @@ CONFIG_I2C_GPIO=y
|
|||
##
|
||||
## file: drivers/i2c/chips/Kconfig
|
||||
##
|
||||
CONFIG_SENSORS_EEPROM=y
|
||||
CONFIG_SENSORS_EEPROM=m
|
||||
CONFIG_SENSORS_PCF8574=m
|
||||
CONFIG_SENSORS_PCA9539=m
|
||||
CONFIG_SENSORS_PCF8591=m
|
||||
|
@ -310,7 +310,7 @@ CONFIG_INPUT_EVDEV=m
|
|||
## file: drivers/input/keyboard/Kconfig
|
||||
##
|
||||
CONFIG_INPUT_KEYBOARD=y
|
||||
CONFIG_KEYBOARD_ATKBD=y
|
||||
CONFIG_KEYBOARD_ATKBD=m
|
||||
# CONFIG_KEYBOARD_SUNKBD is not set
|
||||
# CONFIG_KEYBOARD_LKKBD is not set
|
||||
# CONFIG_KEYBOARD_XTKBD is not set
|
||||
|
@ -327,7 +327,7 @@ CONFIG_INPUT_UINPUT=m
|
|||
## file: drivers/input/mouse/Kconfig
|
||||
##
|
||||
CONFIG_INPUT_MOUSE=y
|
||||
CONFIG_MOUSE_PS2=y
|
||||
CONFIG_MOUSE_PS2=m
|
||||
# CONFIG_MOUSE_SERIAL is not set
|
||||
CONFIG_MOUSE_APPLETOUCH=m
|
||||
# CONFIG_MOUSE_VSXXXAA is not set
|
||||
|
@ -335,10 +335,10 @@ CONFIG_MOUSE_APPLETOUCH=m
|
|||
##
|
||||
## file: drivers/input/serio/Kconfig
|
||||
##
|
||||
CONFIG_SERIO=y
|
||||
CONFIG_SERIO_SERPORT=y
|
||||
CONFIG_SERIO=m
|
||||
CONFIG_SERIO_SERPORT=m
|
||||
# CONFIG_SERIO_PCIPS2 is not set
|
||||
CONFIG_SERIO_LIBPS2=y
|
||||
CONFIG_SERIO_LIBPS2=m
|
||||
# CONFIG_SERIO_RAW is not set
|
||||
|
||||
##
|
||||
|
@ -768,12 +768,6 @@ CONFIG_IXP4XX_WATCHDOG=y
|
|||
# CONFIG_WDTPCI is not set
|
||||
# CONFIG_USBPCWATCHDOG is not set
|
||||
|
||||
##
|
||||
## file: fs/Kconfig
|
||||
##
|
||||
CONFIG_JFFS2_FS=y
|
||||
CONFIG_CRAMFS=y
|
||||
|
||||
##
|
||||
## file: fs/Kconfig.binfmt
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue