Merge master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / include / media / video-buf.h

diff --git a/include/media/video-buf.h b/include/media/video-buf.h
index fff3fd0fbf94056248c1921a0fc057512b7b7c26..1115a256969f0468e6ec079567aa6d32e6c338d5 100644 (file)
--- a/include/media/video-buf.h
+++ b/include/media/video-buf.h
@@ -23,6 +23,7 @@
  */
 
 #include <linux/videodev2.h>
+#include <linux/poll.h>
 
 #define UNSET (-1U)