Merge b633f74265 into 6b73faeee5

Makefile

@@ -15,5 +15,4 @@ install: all
 
 clean:
 	rm -rf */*.o */*.ko */*.mod.c */.*.cmd .tmp_versions Module* modules*
-
-
+	$(MAKE) -C apps clean

apps/Makefile

@@ -1,4 +1,6 @@
-all: cit citin flashprog modt ddtest setmod ddflash
+APPS = cit citin flashprog modt ddtest setmod ddflash
+
+all: $(APPS)
 
 cit: cit.c
 	gcc -o cit cit.c -lpthread
@@ -17,3 +19,6 @@ ddtest: ddtest.c
 
 ddflash: ddflash.c
 	gcc -o ddflash ddflash.c
+
+clean:
+	rm -rf $(APPS)

ddbridge/octonet.c

@@ -25,7 +25,7 @@
 
 #include "ddbridge.h"
 #include "ddbridge-regs.h"
-#include <asm-generic/pci-dma-compat.h>
+#include <linux/pci-dma-compat.h>
 
 static int adapter_alloc = 3;
 module_param(adapter_alloc, int, 0444);