From 03270aaa6b7c7527c1c911298736877b0c2e3db1 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Sun, 25 Nov 2007 14:48:49 +0000 Subject: [PATCH] THINKPAD_ACPI_INPUT_ENABLED was not userspace compat so gone again, nuke references. svn path=/dists/trunk/linux-2.6/; revision=9733 --- debian/changelog | 5 ++--- debian/config/amd64/config | 1 - debian/config/i386/config | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d5137aaf9..58840391b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,7 @@ linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low DM_MULTIPATH_RDAC, NET_SCH_RR, EEPROM_93CX6, PPPOL2TP, CRYPTO_HW, UIO, UIO_CIF, SND_CS5530, RTL8187, PC300TOO, TCG_TIS, SCSI_SAS_ATA. * [i386] Enable lguest. - * [amd64, i386] Enable VIDEO_OUTPUT_CONTROL, THINKPAD_ACPI_INPUT_ENABLED, - NETDEVICES_MULTIQUEUE. + * [amd64, i386] Enable VIDEO_OUTPUT_CONTROL, NETDEVICES_MULTIQUEUE. * linux-image bugscript add cmdline. * [amd64, i386, ia64]: Enable DMIID, ACPI_PROC_EVENT. * Enable TCG_TPM various userspace accesses it. (closes: #439020) @@ -241,7 +240,7 @@ linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low - wait_task_stopped: Check p->exit_state instead of TASK_TRACED (CVE-2007-5500) - TCP: Make sure write_queue_from does not begin with NULL ptr (CVE-2007-5501) - -- Bastian Blank Fri, 16 Nov 2007 23:01:31 +0100 + -- maximilian attems Sun, 25 Nov 2007 15:48:01 +0100 linux-2.6 (2.6.22-6) unstable; urgency=low diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 1112f4489..d33df6275 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -50,7 +50,6 @@ CONFIG_ACPI_ASUS=m CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUG is not set CONFIG_THINKPAD_ACPI_BAY=y -CONFIG_THINKPAD_ACPI_INPUT_ENABLED=y CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set diff --git a/debian/config/i386/config b/debian/config/i386/config index c13f4c286..5f23abb52 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -71,7 +71,6 @@ CONFIG_ACPI_ASUS=m CONFIG_THINKPAD_ACPI=m CONFIG_THINKPAD_ACPI_BAY=y # CONFIG_THINKPAD_ACPI_DEBUG is not set -CONFIG_THINKPAD_ACPI_INPUT_ENABLED=y CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set