Manual fix of bad merge.

diff --git a/l4/pkg/drivers-frst/include/io_regblock_port.h b/l4/pkg/drivers-frst/include/io_regblock_port.h
index d84d618f95ac374d282958ac6e8b726e342ac72f..ea903bc12f80dac1d2b90bb38f5ce4e72b0baab4 100644 (file)
--- a/l4/pkg/drivers-frst/include/io_regblock_port.h
+++ b/l4/pkg/drivers-frst/include/io_regblock_port.h
@@ -51,22 +51,8 @@ namespace L4
     void write32(unsigned long reg, unsigned int val) const
     { asm volatile("out %0, %w1" : : "a" (val), "Nd" (_base + reg)); }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     void delay() const
     { asm volatile ("outb %al,$0x80"); }
-=======
-    void delay() const //root linux in jailhouse have a problem when cell used port 0x80
-    {  
-        asm volatile ("outb %al,$0x80"); 
-       /*for (int i = 0; i < 1000000; i++);*/
-    }
->>>>>>> d8997e7... fiasco: drivers-frst: Get this code back to default state. Port interference problem was solved into the linux kernel configuration.
-=======
-    void delay() const //root linux in jailhouse have a problem when cell used port 0x80
-    {/* asm volatile ("outb %al,$0x80"); */}
->>>>>>> e3e88cd02e4e26d0d588e4c756f63f7aa9447267
-
   private:
     unsigned long _base;
   };