diff -Nur vmxnet-only.orig/compat_netdevice.h vmxnet-only/compat_netdevice.h
--- vmxnet-only.orig/compat_netdevice.h	2007-11-30 04:03:07.000000000 +0100
+++ vmxnet-only/compat_netdevice.h	2008-03-10 15:30:55.000000000 +0100
@@ -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/vm_basic_types.h vmxnet-only/vm_basic_types.h
--- vmxnet-only.orig/vm_basic_types.h	2007-11-30 04:03:07.000000000 +0100
+++ vmxnet-only/vm_basic_types.h	2008-03-10 15:26:28.000000000 +0100
@@ -177,17 +177,25 @@
 #      endif
 #   endif
 
-#   ifndef _STDINT_H
-#      ifdef VM_I386
-#         ifdef VM_X86_64
-             typedef uint64    uintptr_t;
-#         else
-             typedef uint32    uintptr_t;
+/*
+ * uintptr_t is defined since 2.6.24, so defining it here will lead to
+ * compile errors.
+ *
+ * by Alexander Griesser <work@tuxx-home.at>, 2008-03-10
+ */
+#   if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+#      ifndef _STDINT_H
+#         ifdef VM_I386
+#            ifdef VM_X86_64
+                typedef uint64    uintptr_t;
+#            else
+                typedef uint32    uintptr_t;
+#            endif
 #         endif
-#      endif
 
-#      ifdef VM_IA64
-          typedef uint64    uintptr_t;
+#         ifdef VM_IA64
+             typedef uint64    uintptr_t;
+#         endif
 #      endif
 #   endif
 #endif

