Merge ../linux-2.6

[linux-2.6] / drivers / media / video / ov511.h

diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index 12b3d51e1c343bdd77c0d66f99d7962562d71af7..baded1262ca9f68b675ca72d3ad18d045d8f2f41 100644 (file)
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -3,7 +3,8 @@
 
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
-#include <linux/smp_lock.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 
@@ -12,7 +13,7 @@
 #ifdef OV511_DEBUG
        #define PDEBUG(level, fmt, args...) \
                if (debug >= (level)) info("[%s:%d] " fmt, \
-               __FUNCTION__, __LINE__ , ## args)
+               __func__, __LINE__ , ## args)
 #else
        #define PDEBUG(level, fmt, args...) do {} while(0)
 #endif