Signed-off-by: Ákos Kovács <akoskov...@gmx.com>
---
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
