fix of a bad merge.

[jailhouse.git] / configs / novabox.c

diff --git a/configs/novabox.c b/configs/novabox.c
index f9522b0f56d9404cc0daf5beae1214537884eded..b4e83298f444e3fed1b12a331dae6f5a7193a1d8 100644 (file)
--- a/configs/novabox.c
+++ b/configs/novabox.c
@@ -63,17 +63,12 @@ struct {
                        .mmconfig_base = 0xf8000000,
                        .mmconfig_end_bus = 0x3f,
                        .pm_timer_address = 0x408,
-<<<<<<< HEAD
+
                         .iommu_base = {
                                0xfed90000,
                                0xfed91000,
                         },
-=======
-                       .iommu_base = {
-                               0xfed90000,
-                               0xfed91000,
-                       },
->>>>>>> 11dff97feece0823144bbe800b9e56c6995cd2fb
+
                },
                .device_limit = 128,
                .interrupt_limit = 256,