qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [v2 32/71] hw/intc/Kconfig: Add Kconfig file


From: Ákos Kovács
Subject: [Qemu-devel] [v2 32/71] hw/intc/Kconfig: Add Kconfig file
Date: Fri, 27 Sep 2013 04:30:53 +0200

Signed-off-by: Ákos Kovács <address@hidden>
---
 hw/intc/Kconfig | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
index 40d8ebc..4a96318 100644
--- a/hw/intc/Kconfig
+++ b/hw/intc/Kconfig
@@ -16,17 +16,23 @@ config ARM_GIC
 
 config ARM_GIC_KVM
     bool
-    depends on KVM
 
 config IOAPIC
     bool
 
-config OPENPICS
+config OPENPIC
     bool
 
 config OPENPIC_KVM
     bool
 
+<<<<<<< HEAD
+config OPENPIC_KVM
+    bool
+
 config ARMV7M_NVIC
+=======
+config STELLARIS
+>>>>>>> eb5e304... hw/intc/Kconfig: Add Kconfig file
     bool
     select ARM_GIC
-- 
1.8.1.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]