Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / w9968cf.h

diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h
index 2836b45ec2068bd34e519637ee891a483d74b1f3..30032e15e23c2761fc9461462466c0cf82eb381c 100644 (file)
--- a/drivers/media/video/w9968cf.h
+++ b/drivers/media/video/w9968cf.h
@@ -21,14 +21,13 @@
 #ifndef _W9968CF_H_
 #define _W9968CF_H_
 
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/device.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
 #include <linux/wait.h>
-#include <linux/config.h>
 #include <linux/param.h>
 #include <linux/types.h>
 #include <linux/rwsem.h>
@@ -299,7 +298,7 @@ struct w9968cf_device {
                        dev_warn(&cam->dev, fmt "\n", ## args);               \
                else if ((level) >= 5)                                        \
                        dev_info(&cam->dev, "[%s:%d] " fmt "\n",              \
-                                __FUNCTION__, __LINE__ , ## args);           \
+                                __func__, __LINE__ , ## args);           \
        }                                                                     \
 }
 /* For generic kernel (not device specific) messages */
@@ -310,7 +309,7 @@ struct w9968cf_device {
                if ((level) >= 1 && (level) <= 4)                             \
                        pr_info("w9968cf: " fmt "\n", ## args);               \
                else if ((level) >= 5)                                        \
-                       pr_debug("w9968cf: [%s:%d] " fmt "\n", __FUNCTION__,  \
+                       pr_debug("w9968cf: [%s:%d] " fmt "\n", __func__,  \
                                 __LINE__ , ## args);                         \
        }                                                                     \
 }
@@ -322,7 +321,7 @@ struct w9968cf_device {
 
 #undef PDBG
 #define PDBG(fmt, args...)                                                    \
-dev_info(&cam->dev, "[%s:%d] " fmt "\n", __FUNCTION__, __LINE__ , ## args);
+dev_info(&cam->dev, "[%s:%d] " fmt "\n", __func__, __LINE__ , ## args);
 
 #undef PDBGG
 #define PDBGG(fmt, args...) do {;} while(0); /* nothing: it's a placeholder */