[kernel] r9733 - in dists/trunk/linux-2.6/debian: . config/amd64 config/i386

[Maximilian Attems]

Author: maks
Date: Sun Nov 25 14:48:49 2007
New Revision: 9733

Log:
THINKPAD_ACPI_INPUT_ENABLED was not userspace compat
so gone again, nuke references.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Nov 25 14:48:49 2007
@@ -18,8 +18,7 @@
     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 @@
     - 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 <waldi at debian.org>  Fri, 16 Nov 2007 23:01:31 +0100
+ -- maximilian attems <maks at debian.org>  Sun, 25 Nov 2007 15:48:01 +0100
 
 linux-2.6 (2.6.22-6) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Sun Nov 25 14:48:49 2007
@@ -50,7 +50,6 @@
 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

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Sun Nov 25 14:48:49 2007
@@ -71,7 +71,6 @@
 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