[MTHCA] cleanup: use include files consistently

git-svn-id: svn://openib.tc.cornell.edu/gen1@268 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mthca/kernel/SOURCES b/trunk/hw/mthca/kernel/SOURCES
index 22452cf2a77b256ca0ea9f74a9cf6981f3a50cda..a01234f7fd3dcc41ec022bc3c10dd55127e88db3 100644 (file)
--- a/trunk/hw/mthca/kernel/SOURCES
+++ b/trunk/hw/mthca/kernel/SOURCES
@@ -59,11 +59,8 @@ SOURCES= \
 INCLUDES=\\r
        ..; \\r
        $(TRUNK)\inc;   \\r
-       $(TRUNK)\inc\complib; \\r
-       $(TRUNK)\inc\mthca; \\r
-       $(TRUNK)\inc\kernel; \\r
-       $(TRUNK)\inc\kernel\complib; \\r
-       \r
+       $(TRUNK)\inc\kernel;\r
+\r
 C_DEFINES=$(C_DEFINES) -DDRIVER -DDEPRECATE_DDK_FUNCTIONS -D__LITTLE_ENDIAN\r
 \r
 TARGETLIBS= \\r

diff --git a/trunk/hw/mthca/kernel/hca_driver.c b/trunk/hw/mthca/kernel/hca_driver.c
index 49db4bce19e735072862d59d98033a04a501047e..df388be21f18ef6618f0ee9e3adce7365110e081 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_driver.c
+++ b/trunk/hw/mthca/kernel/hca_driver.c
@@ -51,7 +51,7 @@
 //#include "MdCard.h"\r
 #pragma warning( pop )\r
 #include <iba/ib_ci_ifc.h>\r
-#include "mthca_vc.h"\r
+#include "mthca/mthca_vc.h"\r
 \r
 /* from \inc\platform\evntrace.h\r
 #define TRACE_LEVEL_NONE        0   // Tracing is not on\r

diff --git a/trunk/hw/mthca/kernel/mt_atomic.h b/trunk/hw/mthca/kernel/mt_atomic.h
index 883e690e0425a8b5230f1ead143fedd2a8b5b225..4d1411e72d17f607751a446d7d0fe8492f88f682 100644 (file)
--- a/trunk/hw/mthca/kernel/mt_atomic.h
+++ b/trunk/hw/mthca/kernel/mt_atomic.h
@@ -1,7 +1,7 @@
 #ifndef MT_ATOMIC_H
 #define MT_ATOMIC_H
 
-#include "cl_atomic.h"
+#include "complib/cl_atomic.h"
 
 typedef atomic32_t atomic_t;
 

diff --git a/trunk/hw/mthca/mx_abi.h b/trunk/hw/mthca/mx_abi.h
index 66b2bc708abd8352a978bad4919676bff68961b4..474caf17735d41d25084cc49e7bd14c915d27cdf 100644 (file)
--- a/trunk/hw/mthca/mx_abi.h
+++ b/trunk/hw/mthca/mx_abi.h
@@ -37,7 +37,7 @@
 #ifndef MX_ABI_H
 #define MX_ABI_H
 
-#include <cl_types_osd.h>
+#include <complib/cl_types_osd.h>
 
 /*
  * Make sure that all structs defined in this file remain laid out so