MOUSE_PS2_TOUCHKIT defaults to n and disabled in fedora configs too.

svn path=/dists/trunk/linux-2.6/; revision=8891
This commit is contained in:
Maximilian Attems 2007-06-04 09:53:03 +00:00
parent 6040bae970
commit 4d0b3dfdad
2 changed files with 4 additions and 3 deletions

1
debian/arch/config vendored
View File

@ -1330,6 +1330,7 @@ CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
# CONFIG_MOUSE_PS2_TOUCHKIT is not set
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_YENTA_RICOH=y
CONFIG_YENTA_ENE_TUNE=y

6
debian/changelog vendored
View File

@ -14,8 +14,8 @@ linux-2.6 (2.6.22~rc3-1~experimental.1) UNRELEASED; urgency=low
I2C_SIMTEC, I2C_TINY_USB, SC92031, LIBERTAS_USB, RFKILL, RFKILL_INPUT,
MTD_UBI, SND_USB_CAIAQ, SND_USB_CAIAQ_INPUT, USB_BERRY_CHARGE,
RTC_DRV_MAX6900, SUNRPC_BIND34, SND_PORTMAN2X4, FB_VT8623
and disable SCSI_ESP_CORE, SPI_SPIDEV, CRYPT_CRYPTD, SYSV68_PARTITION
in topconfig.
and disable SCSI_ESP_CORE, SPI_SPIDEV, CRYPT_CRYPTD, SYSV68_PARTITION,
MOUSE_PS2_TOUCHKIT in topconfig.
* [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM.
Disable OSS_OBSOLETE.
@ -42,7 +42,7 @@ linux-2.6 (2.6.22~rc3-1~experimental.1) UNRELEASED; urgency=low
on ARM.
* arm/ixp4xx: Add patch to set NSLU2 timer frequency.
-- maximilian attems <maks@debian.org> Mon, 04 Jun 2007 11:17:36 +0200
-- maximilian attems <maks@debian.org> Mon, 04 Jun 2007 11:52:29 +0200
linux-2.6 (2.6.21-3) UNRELEASED; urgency=low