--- linux.trees.git/include/linux/videodev2.h.org	2008-08-15 16:31:03.000000000 -0700
+++ linux.trees.git/include/linux/videodev2.h	2008-08-15 16:31:11.000000000 -0700
@@ -59,7 +59,6 @@
 #include <linux/time.h>     /* need struct timeval */
 #include <linux/compiler.h> /* need __user */
 #else
-#define __user
 #include <sys/time.h>
 #endif
 #include <linux/ioctl.h>