x86: sync 2.6.39 configs

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31749 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 34 insertions, 7 deletions

diff --git a/target/linux/x86/kvm_guest/config-default b/target/linux/x86/kvm_guest/config-default
index 655d18ca6..6597ab8fe 100644
--- a/target/linux/x86/kvm_guest/config-default
+++ b/target/linux/x86/kvm_guest/config-default
@@ -1,50 +1,77 @@
 CONFIG_ACPI=y
-# CONFIG_ACPI_PROC_EVENT is not set
 # CONFIG_ACPI_AC is not set
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_BATTERY is not set
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_BUTTON=y
+# CONFIG_ACPI_CMPC is not set
 # CONFIG_ACPI_CONTAINER is not set
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_DOCK is not set
+# CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_FAN is not set
-CONFIG_ACPI_HOTPLUG_CPU=y
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_PROCESSOR=y
 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
 # CONFIG_ACPI_PROCFS is not set
 # CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_PROC_EVENT is not set
+# CONFIG_ACPI_QUICKSTART is not set
 # CONFIG_ACPI_SBS is not set
-CONFIG_ACPI_SYSFS_POWER=y
-# CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_THERMAL is not set
 # CONFIG_ACPI_WMI is not set
+# CONFIG_ASUS_LAPTOP is not set
+CONFIG_CONSOLE_TRANSLATIONS=y
+# CONFIG_DMAR is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_EFI is not set
+# CONFIG_HPET is not set
+# CONFIG_HP_ACCEL is not set
+CONFIG_HVC_DRIVER=y
+CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM_VIRTIO is not set
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
+# CONFIG_INTEL_IPS is not set
 # CONFIG_KVM is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 # CONFIG_LGUEST is not set
 # CONFIG_LGUEST_GUEST is not set
-# CONFIG_MICROCODE is not set
+CONFIG_NLS=y
 CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_CLOCK=y
 CONFIG_PARAVIRT_GUEST=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PNP=y
 CONFIG_PNPACPI=y
+CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_SERIAL_8250_PNP=y
 # CONFIG_THINKPAD_ACPI is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
+# CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VHOST_NET is not set
 CONFIG_VIRTIO=y
 # CONFIG_VIRTIO_BALLOON is not set
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_VIRTIO_NET is not set
 CONFIG_VIRTIO_PCI=y
-# CONFIG_VIRTIO_RANDOM is not set
 CONFIG_VIRTIO_RING=y
 CONFIG_VIRTUALIZATION=y
-# CONFIG_VMI is not set
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_X86_ACPI_CPUFREQ is not set
+# CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_PAT is not set
+# CONFIG_X86_PCC_CPUFREQ is not set
+CONFIG_X86_PM_TIMER=y
+# CONFIG_X86_POWERNOW_K8 is not set
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+# CONFIG_XO15_EBOOK is not set