From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 13 Feb 2010 21:06:50 +0000 (+0000)
Subject: revert accidentally committed changes in Xen config
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1875c08dda6ff684a29d89ae493d037324de8ac6;p=openwrt%2Fstaging%2Flinusw.git

revert accidentally committed changes in Xen config

SVN-Revision: 19627
---

diff --git a/target/linux/x86/xen_domu/config-default b/target/linux/x86/xen_domu/config-default
index 992d39da66..0e8a382f09 100644
--- a/target/linux/x86/xen_domu/config-default
+++ b/target/linux/x86/xen_domu/config-default
@@ -1,35 +1,18 @@
-# CONFIG_CLASSIC_RCU is not set
 # CONFIG_KERNEL_LZMA is not set
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_X86_CPU_DEBUG is not set
-# CONFIG_X86_OLD_MCE is not set
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_FREEZER=y
 CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
-CONFIG_HAVE_FTRACE_SYSCALLS=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_PERF_COUNTERS=y
-CONFIG_HOTPLUG_CPU=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
 CONFIG_KERNEL_GZIP=y
 CONFIG_LOCK_KERNEL=y
-CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 CONFIG_MPENTIUM4=y
 CONFIG_NR_CPUS=4
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_RCU_FANOUT=32
 CONFIG_SCHED_MC=y
 CONFIG_SMP=y
 CONFIG_SPARSE_IRQ=y
@@ -42,7 +25,7 @@ CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_X86_HT=y
 CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_NEW_MCE=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_PAE=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y