aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-11-02 07:36:13 +0000
committerJohn Crispin <blogic@openwrt.org>2012-11-02 07:36:13 +0000
commitc6c5af7a35a8ba37a8d5675381899c9051d41283 (patch)
tree2c3005c5ca45bfad55d152ad2dfbdd9e6a553fe4
parent3139cd576769d47c34ac51e7e5be18e13208506e (diff)
downloadupstream-c6c5af7a35a8ba37a8d5675381899c9051d41283.tar.gz
upstream-c6c5af7a35a8ba37a8d5675381899c9051d41283.tar.bz2
upstream-c6c5af7a35a8ba37a8d5675381899c9051d41283.zip
[x86] fix full builds for xen / kvm
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34056 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/x86/kvm_guest/config-3.38
-rw-r--r--target/linux/x86/xen_domu/config-3.31
2 files changed, 9 insertions, 0 deletions
diff --git a/target/linux/x86/kvm_guest/config-3.3 b/target/linux/x86/kvm_guest/config-3.3
index 38f9db63dc..4b92e03348 100644
--- a/target/linux/x86/kvm_guest/config-3.3
+++ b/target/linux/x86/kvm_guest/config-3.3
@@ -24,10 +24,18 @@ CONFIG_ACPI_PROCESSOR=y
CONFIG_CONSOLE_TRANSLATIONS=y
CONFIG_CPU_IDLE_GOV_MENU=y
CONFIG_DUMMY_CONSOLE=y
+# CONFIG_EEEPC_LAPTOP is not set
# CONFIG_EFI is not set
CONFIG_HIGHMEM4G=y
CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_FAKE is not set
+# CONFIG_HOTPLUG_PCI_COMPAQ is not set
CONFIG_HOTPLUG_PCI_ACPI=y
+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+CONFIG_HOTPLUG_PCI_PCIE=y
# CONFIG_HPET is not set
# CONFIG_HP_ACCEL is not set
CONFIG_HVC_DRIVER=y
diff --git a/target/linux/x86/xen_domu/config-3.3 b/target/linux/x86/xen_domu/config-3.3
index c34df71adc..6372a32fc7 100644
--- a/target/linux/x86/xen_domu/config-3.3
+++ b/target/linux/x86/xen_domu/config-3.3
@@ -11,6 +11,7 @@ CONFIG_HOTPLUG_CPU=y
CONFIG_HVC_DRIVER=y
CONFIG_HVC_IRQ=y
CONFIG_HVC_XEN=y
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
CONFIG_IOMMU_HELPER=y
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_XZ is not set