Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / media / video / stv680.c

diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index 1542797c048f84e0fb926fd9f04ee90ed1e46cad..d7f130bedb5f47a05f6eddff87634e6af54d25c4 100644 (file)
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -83,7 +83,7 @@ static unsigned int debug;
 #define PDEBUG(level, fmt, args...) \
        do { \
        if (debug >= level)     \
-               info("[%s:%d] " fmt, __FUNCTION__, __LINE__ , ## args); \
+               info("[%s:%d] " fmt, __func__, __LINE__ , ## args);     \
        } while (0)
 
 
@@ -1394,7 +1394,9 @@ static const struct file_operations stv680_fops = {
        .read =         stv680_read,
        .mmap =         stv680_mmap,
        .ioctl =        stv680_ioctl,
+#ifdef CONFIG_COMPAT
        .compat_ioctl = v4l_compat_ioctl32,
+#endif
        .llseek =       no_llseek,
 };
 static struct video_device stv680_template = {