[linux-dvb] compile error

[linux-dvb] compile error

[e9hack]

Hi,

compiling of the current hg tree fails with the following message:

   CC [M]  /usr/src/v4l-dvb/v4l/flexcop-pci.o
In file included from /usr/src/v4l-dvb/v4l/flexcop-common.h:12,
                  from /usr/src/v4l-dvb/v4l/flexcop-pci.c:10:
/usr/src/v4l-dvb/v4l/compat.h:539: error: static declaration of 'proc_create' follows 
non-static declaration
/usr/src/linux-2.6.25/include/linux/proc_fs.h:128: error: previous declaration of 
'proc_create' was here
make[5]: *** [/usr/src/v4l-dvb/v4l/flexcop-pci.o] Error 1

This patch does fix the problem:

diff -r 6aa6656852cb v4l/compat.h
--- a/v4l/compat.h      Wed Apr 16 13:13:15 2008 -0300
+++ b/v4l/compat.h      Fri Apr 18 19:33:38 2008 +0200
@@ -533,6 +533,7 @@ do { 
       \
         le16_to_cpu(get_unaligned((unsigned short *)(a)))
  #define put_unaligned_le16(r, a)                               \
         put_unaligned(cpu_to_le16(r), ((unsigned short *)(a)))
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
  #ifdef CONFIG_PROC_FS
  static inline struct proc_dir_entry *proc_create(const char *a,
         mode_t b, struct proc_dir_entry *c, const struct file_operations *d)
@@ -549,5 +550,6 @@ static inline struct proc_dir_entry *pro
  }
  #endif
  #endif
-
-#endif
+#endif
+
+#endif

-Hartmut

_______________________________________________
linux-dvb mailing list
linux-dvb@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb