From cc58201a750068a54b6d70a398936d890639f013 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 28 Jun 2008 21:46:22 -0300 Subject: Fix s2255drv compilation against older kernels From: Mauro Carvalho Chehab As reported by Hermann Pitton: CC [M] /mnt/xfer/mercurial/v4l-dvb-head/v4l-dvb/v4l/s2255drv.o s2255drv.c: In function 'vidioc_querycap': s2255drv.c:809: error: implicit declaration of function 'dev_name' s2255drv.c:809: warning: passing argument 2 of 'strlcpy' makes pointer from integer without a cast Tested with kernel 2.6.25.6 Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/s2255drv.c | 1 + v4l/compat.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/linux/drivers/media/video/s2255drv.c b/linux/drivers/media/video/s2255drv.c index 6d5fbad95..aca8c3d90 100644 --- a/linux/drivers/media/video/s2255drv.c +++ b/linux/drivers/media/video/s2255drv.c @@ -51,6 +51,7 @@ #include #include #include +#include "compat.h" #define FIRMWARE_FILE_NAME "f2255usb.bin" diff --git a/v4l/compat.h b/v4l/compat.h index 69a86bb72..88afe3d83 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -592,6 +592,8 @@ static inline struct proc_dir_entry *proc_create_data(const char *a, ( h ), \ ( x ) ) ) +#define dev_name(dev) ((dev)->bus_id) + #endif #endif -- cgit v1.2.3