diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-13 21:06:50 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-13 21:06:50 +0000 |
| commit | 56061f995439426a31727f7f1d59b5a79432f424 (patch) | |
| tree | 1818738a75dd892b254d5c56e54cbb7e014a5014 /target/linux/x86/xen_domu | |
| parent | a15c63ac4f86f698dc0121b54d0868bc02eaf0ff (diff) | |
| download | upstream-56061f995439426a31727f7f1d59b5a79432f424.tar.gz upstream-56061f995439426a31727f7f1d59b5a79432f424.tar.bz2 upstream-56061f995439426a31727f7f1d59b5a79432f424.zip | |
[x86] revert accidentally committed changes in Xen config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19627 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/xen_domu')
| -rw-r--r-- | target/linux/x86/xen_domu/config-default | 19 |
1 files changed, 1 insertions, 18 deletions
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 |