diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 10:04:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-08 10:04:50 +0000 |
| commit | 0f07e7c9a8c38a625a8ac646a94d1fa2f075eef8 (patch) | |
| tree | a354fbd7fc9eb3cb50d130f628a5d10a6f6a0644 /target/linux/x86/kvm_guest | |
| parent | 363b166eb9ebf1b409d6699a11a29a1c10f52509 (diff) | |
| download | upstream-0f07e7c9a8c38a625a8ac646a94d1fa2f075eef8.tar.gz upstream-0f07e7c9a8c38a625a8ac646a94d1fa2f075eef8.tar.bz2 upstream-0f07e7c9a8c38a625a8ac646a94d1fa2f075eef8.zip | |
x86: update to linux 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43559
Diffstat (limited to 'target/linux/x86/kvm_guest')
| -rw-r--r-- | target/linux/x86/kvm_guest/config-default | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/target/linux/x86/kvm_guest/config-default b/target/linux/x86/kvm_guest/config-default index 3355c344e4..792e62afc5 100644 --- a/target/linux/x86/kvm_guest/config-default +++ b/target/linux/x86/kvm_guest/config-default @@ -1,7 +1,6 @@ CONFIG_ACPI=y # CONFIG_ACPI_AC 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 @@ -16,14 +15,11 @@ 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_SBS 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_CPU_IDLE_GOV_MENU=y -CONFIG_DUMMY_CONSOLE=y # CONFIG_EEEPC_LAPTOP is not set # CONFIG_EFI is not set CONFIG_HOTPLUG_PCI=y @@ -37,14 +33,12 @@ CONFIG_HOTPLUG_PCI_PCIE=y # 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_HYPERVISOR_GUEST=y -CONFIG_INPUT=y -CONFIG_INPUT_KEYBOARD=y # CONFIG_INTEL_IPS is not set -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_ISCSI_IBFT_FIND is not set # CONFIG_KVM is not set +# CONFIG_KVM_DEBUG_FS is not set CONFIG_KVM_GUEST=y # CONFIG_LGUEST is not set # CONFIG_LGUEST_GUEST is not set @@ -63,13 +57,12 @@ CONFIG_PNP=y CONFIG_PNPACPI=y CONFIG_PNP_DEBUG_MESSAGES=y # CONFIG_PVPANIC is not set +# CONFIG_SAMSUNG_Q10 is not set # CONFIG_SCSI_VIRTIO is not set 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_BLK=y @@ -78,8 +71,6 @@ CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTUALIZATION=y # CONFIG_VMWARE_BALLOON 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_E_POWERSAVER is not set |