diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-28 21:46:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-28 21:46:22 -0300 |
| commit | cc58201a750068a54b6d70a398936d890639f013 (patch) | |
| tree | 799e8bcbf633ed27c018728e67997c0cf4e046c3 | |
| parent | 4f2d17789141dd027ea033ac9a6f8b2922bf5a58 (diff) | |
| download | mediapointer-dvb-s2-cc58201a750068a54b6d70a398936d890639f013.tar.gz mediapointer-dvb-s2-cc58201a750068a54b6d70a398936d890639f013.tar.bz2 | |
Fix s2255drv compilation against older kernels
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/s2255drv.c | 1 | ||||
| -rw-r--r-- | v4l/compat.h | 2 |
2 files changed, 3 insertions, 0 deletions
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 <media/v4l2-common.h> #include <linux/vmalloc.h> #include <linux/usb.h> +#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 |