Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[people/teissler/ipfire-2.x.git] / config / kernel / kernel.config.i586-ipfire-xen

diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index aa3e2b42d6bb6b46ab8d414484f7c8ebeab16d00..5ae27c2c427c981b529ca482a9369ecebb80a5b3 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
 # Automatically generated make config: don't edit

-# Linux kernel version: 2.6.27.25-ipfire-xen
-# Sun Aug  9 16:17:27 2009
+# Linux kernel version: 2.6.27.31
+# Mon Sep  7 10:05:41 2009

 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y


@@ -252,6 +252,7 @@ CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y

+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

 # CONFIG_HIGHPTE is not set
 CONFIG_MTRR=y
 # CONFIG_X86_PAT is not set
 # CONFIG_HIGHPTE is not set
 CONFIG_MTRR=y
 # CONFIG_X86_PAT is not set


@@ -926,7 +927,6 @@ CONFIG_SONY_LAPTOP=m
 # CONFIG_SONYPI_COMPAT is not set
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 # CONFIG_SONYPI_COMPAT is not set
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set

-CONFIG_THINKPAD_ACPI_BAY=y

 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m


@@ -2852,6 +2852,7 @@ CONFIG_XEN_SMPBOOT=y
 CONFIG_XEN_DEVMEM=y
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DEVMEM=y
 CONFIG_XEN_BALLOON=y
 CONFIG_XEN_SCRUB_PAGES=y

+# CONFIG_STAGING is not set

 
 #
 # Firmware Drivers
 
 #
 # Firmware Drivers