Index: devices/generic.c
===================================================================
--- devices/generic.c	(revision 54135)
+++ devices/generic.c	(working copy)
@@ -405,7 +405,11 @@
     INIT_LIST_HEAD(&descs);
 
     read_lock(&dev_base_lock);
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 18)
+    for(netdev = dev_base; netdev != NULL; netdev = netdev->next) {
+#else
     for_each_netdev(&init_net, netdev) {
+#endif
         if (netdev->type != ARPHRD_ETHER)
             continue;
         desc = kmalloc(sizeof(ec_gen_interface_desc_t), GFP_ATOMIC);
Index: master/cdev.c
===================================================================
--- master/cdev.c	(revision 54135)
+++ master/cdev.c	(working copy)
@@ -3864,7 +3864,7 @@
 
     page = vmalloc_to_page(priv->process_data + offset);
 
-    EC_MASTER_DBG(master, "Nopage fault vma, address = %#lx,"
+    EC_MASTER_DBG(priv->cdev->master, 1, "Nopage fault vma, address = %#lx,"
             " offset = %#lx, page = %p\n", address, offset, page);
 
     get_page(page);
Index: master/ethernet.h
===================================================================
--- master/ethernet.h	(revision 54135)
+++ master/ethernet.h	(working copy)
@@ -39,7 +39,11 @@
 
 #include <linux/list.h>
 #include <linux/netdevice.h>
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 18)
+#include <asm/semaphore.h>
+#else
 #include <linux/semaphore.h>
+#endif
 
 #include "globals.h"
 #include "slave.h"