leave ACPI on or else nodes with e1000 and weird IDE controllers cannot be kexec...

diff --git a/configs/kernel-2.6.10-i686-planetlab.config b/configs/kernel-2.6.10-i686-planetlab.config
index 365ffb8..2816966 100644 (file)
--- a/configs/kernel-2.6.10-i686-planetlab.config
+++ b/configs/kernel-2.6.10-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
 # Automatically generated make config: don't edit

-# Linux kernel version: 2.6.10-1.771_FC2.1.planetlab
-# Wed May 18 18:00:08 2005
+# Linux kernel version: 2.6.10-1.771_FC2.2.planetlab.2005.05.24
+# Thu May 26 12:36:52 2005

 #
 CONFIG_X86=y
 CONFIG_MMU=y
 #
 CONFIG_X86=y
 CONFIG_MMU=y


@@ -152,6 +152,7 @@ CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_HIGHPTE=y
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y

+# CONFIG_EFI is not set

 CONFIG_REGPARM=y
 CONFIG_KERN_PHYS_OFFSET=1
 CONFIG_KEXEC=y
 CONFIG_REGPARM=y
 CONFIG_KERN_PHYS_OFFSET=1
 CONFIG_KEXEC=y


@@ -165,8 +166,26 @@ CONFIG_KEXEC=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #

-# CONFIG_ACPI is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+# CONFIG_ACPI_BUTTON is not set
+# CONFIG_ACPI_VIDEO is not set
+# CONFIG_ACPI_FAN is not set
+# CONFIG_ACPI_PROCESSOR is not set
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_IBM is not set
+# CONFIG_ACPI_TOSHIBA is not set

 CONFIG_ACPI_BLACKLIST_YEAR=2001
 CONFIG_ACPI_BLACKLIST_YEAR=2001

+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+# CONFIG_X86_PM_TIMER is not set

 
 #
 # CPU Frequency scaling
 
 #
 # CPU Frequency scaling


@@ -183,6 +202,7 @@ CONFIG_PCI=y
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y

+CONFIG_PCI_MMCONFIG=y

 CONFIG_PCI_LEGACY_PROC=y
 # CONFIG_PCI_NAMES is not set
 CONFIG_ISA=y
 CONFIG_PCI_LEGACY_PROC=y
 # CONFIG_PCI_NAMES is not set
 CONFIG_ISA=y


@@ -873,6 +893,7 @@ CONFIG_HW_CONSOLE=y
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y

+# CONFIG_SERIAL_8250_ACPI is not set

 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y


@@ -916,6 +937,7 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_DRM is not set
 # CONFIG_MWAVE is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_DRM is not set
 # CONFIG_MWAVE is not set
 # CONFIG_RAW_DRIVER is not set

+# CONFIG_HPET is not set

 CONFIG_HANGCHECK_TIMER=y
 
 #
 CONFIG_HANGCHECK_TIMER=y
 
 #