From 6e22b744f546706d8429a6d4714a865e9270f63c Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sat, 11 Jan 2014 17:59:51 +0100 Subject: [PATCH 115/212] Partially revert "rhel: Drop "cfi.pflash01" and "isa-ide" device" RH-Author: Laszlo Ersek Message-id: <1389463208-6278-2-git-send-email-lersek@redhat.com> Patchwork-id: 56615 O-Subject: [RHEL-7.0 qemu-kvm PATCH 01/18] Partially revert "rhel: Drop "cfi.pflash01" and "isa-ide" device" Bugzilla: 1032346 RH-Acked-by: Paolo Bonzini RH-Acked-by: Amos Kong RH-Acked-by: Andrew Jones RH-Acked-by: Kevin Wolf This reverts the cfi.pflash01 elimination in commit f6852e27575e095269a47f434d318b5fc8822e0a. Signed-off-by: Laszlo Ersek --- default-configs/x86_64-softmmu.mak | 1 + 1 file changed, 1 insertion(+) Signed-off-by: Miroslav Rezanina --- default-configs/x86_64-softmmu.mak | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 288ef72..9cc8b5f 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -19,6 +19,7 @@ CONFIG_I8257=y CONFIG_IDE_PIIX=y CONFIG_PIIX_PCI=y CONFIG_I8259=y +CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=$(CONFIG_TPM) CONFIG_PCI_HOTPLUG_OLD=y CONFIG_MC146818RTC=y -- 1.7.1