X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fgeneric.c;fp=palacios%2Fsrc%2Fdevices%2Fgeneric.c;h=dc018ab5c32e67bdbfcf894816d5695580faaecb;hb=7617d3cee4bd93b90558206b1bb1681c07f0396a;hp=905a9a7657fa9bd6515f6b6301d09cdc661cd52d;hpb=6eecf583b522147ef13faabb634562f6f23bb712;p=palacios.git

diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c
index 905a9a7..dc018ab 100644
--- a/palacios/src/devices/generic.c
+++ b/palacios/src/devices/generic.c
@@ -2,6 +2,8 @@
 /* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
 
 
+
+
 #include <devices/generic.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_types.h>
@@ -99,7 +101,10 @@ int generic_write_port_passthrough(ushort_t port,
 
   switch (length) {
   case 1:
+<<<<<<< HEAD:palacios/src/devices/generic.c
+=======
 
+>>>>>>> ramdisk:palacios/src/devices/generic.c
     v3_outb(port,((uchar_t*)src)[0]);
     break;
   case 2:
@@ -107,7 +112,10 @@ int generic_write_port_passthrough(ushort_t port,
     break;
   case 4:
     v3_outdw(port,((uint_t*)src)[0]);
+<<<<<<< HEAD:palacios/src/devices/generic.c
+=======
 
+>>>>>>> ramdisk:palacios/src/devices/generic.c
     break;
   default:
     for (i = 0; i < length; i++) {