diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-01 09:20:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-01 09:20:34 -0300 |
| commit | 6cb6f415645d1ee7acbfdc0829da759aaefe3e8e (patch) | |
| tree | 5ab905fecbdd69dbc41a15deabae75ea5595e1c9 | |
| parent | e1f9cac1bd52d6d0045cf6583854f1432483334a (diff) | |
| download | mediapointer-dvb-s2-6cb6f415645d1ee7acbfdc0829da759aaefe3e8e.tar.gz mediapointer-dvb-s2-6cb6f415645d1ee7acbfdc0829da759aaefe3e8e.tar.bz2 | |
backport kernel changes
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
A few changes were done at mainstream, affecting v4l/dvb drivers. Backport those
changes to the out-kernel tree.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-cards.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-video.c | 5 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 4 | ||||
| -rw-r--r-- | linux/sound/pci/bt87x.c | 1 |
5 files changed, 8 insertions, 6 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 3b51cdef8..694a3313b 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -45,7 +45,7 @@ struct usb_device_id pvr2_device_table[] = { [PVR2_HDW_TYPE_29XXX] = { USB_DEVICE(0x2040, 0x2900) }, [PVR2_HDW_TYPE_24XXX] = { USB_DEVICE(0x2040, 0x2400) }, - { USB_DEVICE(0, 0) }, + { } }; MODULE_DEVICE_TABLE(usb, pvr2_device_table); diff --git a/linux/drivers/media/video/usbvision/usbvision-cards.c b/linux/drivers/media/video/usbvision/usbvision-cards.c index a3b29ae2a..f09eb1027 100644 --- a/linux/drivers/media/video/usbvision/usbvision-cards.c +++ b/linux/drivers/media/video/usbvision/usbvision-cards.c @@ -1081,7 +1081,7 @@ struct usb_device_id usbvision_table [] = { { USB_DEVICE(0x2304, 0x0301), .driver_info=PINNA_LINX_VD_IN_CAB_PAL }, { USB_DEVICE(0x2304, 0x0419), .driver_info=PINNA_PCTV_BUNGEE_PAL_FM }, { USB_DEVICE(0x2400, 0x4200), .driver_info=HPG_WINTV }, - { }, /* terminate list */ + { }, /* terminate list */ }; MODULE_DEVICE_TABLE (usb, usbvision_table); diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c index ddde57f0b..32713aae9 100644 --- a/linux/drivers/media/video/usbvision/usbvision-video.c +++ b/linux/drivers/media/video/usbvision/usbvision-video.c @@ -1475,7 +1475,6 @@ static const struct file_operations usbvision_fops = { .ioctl = video_ioctl2, .llseek = no_llseek, /* .poll = video_poll, */ - .mmap = usbvision_v4l2_mmap, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) .compat_ioctl = v4l_compat_ioctl32, #endif @@ -1507,7 +1506,7 @@ static struct video_device usbvision_video_template = { .vidioc_s_input = vidioc_s_input, .vidioc_queryctrl = vidioc_queryctrl, .vidioc_g_audio = vidioc_g_audio, - .vidioc_g_audio = vidioc_s_audio, + .vidioc_s_audio = vidioc_s_audio, .vidioc_g_ctrl = vidioc_g_ctrl, .vidioc_s_ctrl = vidioc_s_ctrl, .vidioc_streamon = vidioc_streamon, @@ -1573,7 +1572,7 @@ static struct video_device usbvision_radio_template= .vidioc_s_input = vidioc_s_input, .vidioc_queryctrl = vidioc_queryctrl, .vidioc_g_audio = vidioc_g_audio, - .vidioc_g_audio = vidioc_s_audio, + .vidioc_s_audio = vidioc_s_audio, .vidioc_g_ctrl = vidioc_g_ctrl, .vidioc_s_ctrl = vidioc_s_ctrl, .vidioc_g_tuner = vidioc_g_tuner, diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 24ab95924..45dfc7a04 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -363,6 +363,9 @@ void *priv; #endif }; +/* Class-dev to video-device */ +#define to_video_device(cd) container_of(cd, struct video_device, class_dev) + /* Version 2 functions */ extern int video_register_device(struct video_device *vfd, int type, int nr); void video_unregister_device(struct video_device *); @@ -385,7 +388,6 @@ extern int video_usercopy(struct inode *inode, struct file *file, #include <linux/mm.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) -#define to_video_device(cd) container_of(cd, struct video_device, class_dev) static inline int __must_check video_device_create_file(struct video_device *vfd, struct class_device_attribute *attr) diff --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index 5714eead0..a6e7971e3 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -26,6 +26,7 @@ #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/slab.h> +#include <linux/moduleparam.h> #include <linux/bitops.h> #include <asm/io.h> #include <sound/core.h> |