[kernel] r13646 - in dists/trunk/linux-2.6/debian/config: amd64 kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Wed May 20 14:27:52 2009
New Revision: 13646

Log:
* debian/config/amd64/config: Remove ACPI options.
* debian/config/kernelarch-x86/config: Add ACPI options.

Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 20 14:24:12 2009	(r13645)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 20 14:27:52 2009	(r13646)
@@ -5,30 +5,6 @@
 CONFIG_CRYPTO_AES_NI_INTEL=m
 
 ##
-## file: drivers/acpi/Kconfig
-##
-CONFIG_ACPI=y
-CONFIG_ACPI_PROCFS=y
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_SYSFS_POWER=y
-# CONFIG_ACPI_PROC_EVENT is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
-CONFIG_ACPI_SBS=m
-
-##
 ## file: drivers/ata/Kconfig
 ##
 # CONFIG_PATA_SIS is not set

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed May 20 14:24:12 2009	(r13645)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed May 20 14:27:52 2009	(r13646)
@@ -109,6 +109,29 @@
 # CONFIG_XEN_DEBUG_FS is not set
 
 ##
+## file: drivers/acpi/Kconfig
+##
+CONFIG_ACPI=y
+CONFIG_ACPI_PROCFS=y
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_SYSFS_POWER=y
+# CONFIG_ACPI_PROC_EVENT is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_SBS=m
+
+##
 ## file: unknown
 ##
 # CONFIG_PARAVIRT_SPINLOCKS is not set