diff -Nur vmxnet-only.orig/compat_netdevice.h vmxnet-only/compat_netdevice.h
--- vmxnet-only.orig/compat_netdevice.h	2008-03-19 03:30:16.000000000 +0100
+++ vmxnet-only/compat_netdevice.h	2008-05-06 20:30:37.000000000 +0200
@@ -59,7 +59,16 @@
 #   define COMPAT_NETDEV_MOD_INC_USE_COUNT MOD_INC_USE_COUNT
 #   define COMPAT_NETDEV_MOD_DEC_USE_COUNT MOD_DEC_USE_COUNT
 #else
-#   define COMPAT_SET_MODULE_OWNER(dev) SET_MODULE_OWNER(dev)
+/*
+ * SET_MODULE_OWNER disappeared in 2.6.24 again, so make sure to kill it here
+ *
+ * by Alexander Griesser <work@tuxx-home.at>, 2008-03-10
+ */
+#   if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+#     define COMPAT_SET_MODULE_OWNER(dev) SET_MODULE_OWNER(dev)
+#   else
+#     define COMPAT_SET_MODULE_OWNER(dev) do {} while (0)
+#   endif
 #   define COMPAT_NETDEV_MOD_INC_USE_COUNT do {} while (0)
 #   define COMPAT_NETDEV_MOD_DEC_USE_COUNT do {} while (0)
 #endif
diff -Nur vmxnet-only.orig/driver-config.h vmxnet-only/driver-config.h
--- vmxnet-only.orig/driver-config.h	2008-03-19 03:30:16.000000000 +0100
+++ vmxnet-only/driver-config.h	2008-05-06 20:33:25.000000000 +0200
@@ -35,6 +35,23 @@
 #include <linux/autoconf.h>
 #include "compat_version.h"
 
+/*
+ * I still haven't figured out why the automagic checks in Makefile.kernel
+ * don't work. They call the script vm_check_build which isn't available
+ * on any of my systems so `make` is unable to find out whether this features
+ * need to be included or not.
+ *
+ * A simple workaround is to rely on the kernel configuration as shown below.
+ * If CONFIG_EPOLL is set, we have EPOLL set, basta.
+ *
+ * by Alexander Griesser <work@tuxx-home.at>, 2008-03-14
+ */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+#ifdef CONFIG_EPOLL
+#define VMW_HAVE_EPOLL 1
+#endif
+#endif
+
 /* We rely on Kernel Module support.  Check here. */
 #ifndef CONFIG_MODULES
 #error "No Module support in this kernel.  Please configure with CONFIG_MODULES"
@@ -59,6 +76,18 @@
 #endif
 #endif
 
+/*
+ * Force the uintptr_t definition to come from linux/types.h instead of
+ * vm_basic_types.h
+ *
+ * Backported from open-vm-tools
+ * by Alexander Griesser <work@tuxx-home.at>, 2008-04-27
+ */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+#   include <linux/types.h>
+#   define _STDINT_H 1
+#endif
+
 #ifndef __KERNEL__
 #define __KERNEL__
 #endif