diff --git a/[refs] b/[refs]
index e908a26ed105..9d524121a3e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 136280322d894e6ec07187f2427b00c3d64ad066
+refs/heads/master: 51b39dfa5477fdb2459e3c46f855f01b8b03102d
diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.h b/trunk/drivers/media/video/ivtv/ivtv-driver.h
index 32dfc7a859fa..3bda1df63cb6 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-driver.h
+++ b/trunk/drivers/media/video/ivtv/ivtv-driver.h
@@ -62,7 +62,7 @@
 #include <media/tuner.h>
 #include <media/cx2341x.h>
 
-#include <media/ivtv.h>
+#include <linux/ivtv.h>
 
 
 /* Memory layout */
diff --git a/trunk/include/media/ivtv.h b/trunk/include/linux/ivtv.h
similarity index 93%
rename from trunk/include/media/ivtv.h
rename to trunk/include/linux/ivtv.h
index 412b48ea8eda..794b8daa9378 100644
--- a/trunk/include/media/ivtv.h
+++ b/trunk/include/linux/ivtv.h
@@ -18,8 +18,15 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _LINUX_IVTV_H
-#define _LINUX_IVTV_H
+#ifndef __LINUX_IVTV_H__
+#define __LINUX_IVTV_H__
+
+#ifdef __KERNEL__
+#include <linux/compiler.h> /* need __user */
+#else
+#define __user
+#endif
+#include <linux/types.h>
 
 /* ivtv knows several distinct output modes: MPEG streaming,
    YUV streaming, YUV updates through user DMA and the passthrough