[kernel] r20142 - in dists/sid/linux/debian/config: ia64 kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Thu May 30 03:17:40 2013
New Revision: 20142

Log:
Change ACPI_CONTAINER and ACPI_PCI_SLOT to built-in, as they can no longer be modular

Modified:
   dists/sid/linux/debian/config/ia64/config
   dists/sid/linux/debian/config/kernelarch-x86/config

Modified: dists/sid/linux/debian/config/ia64/config
==============================================================================
--- dists/sid/linux/debian/config/ia64/config	Thu May 30 03:07:48 2013	(r20141)
+++ dists/sid/linux/debian/config/ia64/config	Thu May 30 03:17:40 2013	(r20142)
@@ -70,7 +70,7 @@
 ## file: drivers/acpi/Kconfig
 ##
 CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_CONTAINER=y
 
 ##

Modified: dists/sid/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-x86/config	Thu May 30 03:07:48 2013	(r20141)
+++ dists/sid/linux/debian/config/kernelarch-x86/config	Thu May 30 03:17:40 2013	(r20142)
@@ -150,8 +150,8 @@
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m