diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-08 16:26:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-08 16:26:13 -0300 |
| commit | 789d51c810626c90641912d4d260295be0b57d87 (patch) | |
| tree | c391a3d06174a1f31ea7e3185cf9f75718631d2e /v4l | |
| parent | bee12cc3dc8cc34a30ff03b084b809f5bfbb2217 (diff) | |
| download | mediapointer-dvb-s2-789d51c810626c90641912d4d260295be0b57d87.tar.gz mediapointer-dvb-s2-789d51c810626c90641912d4d260295be0b57d87.tar.bz2 | |
V4L: convert struct class_device to struct device
From: Kay Sievers <kay.sievers@vrfy.org>
The currently used "struct class_device" will be removed from the
kernel. Here is a patch that converts all users in drivers/media/video/
to struct device.
Reviewed-by: Thierry Merle <thierry.merle@free.fr>
Reviewed-by: Mike Isely <isely@pobox.com>
Reviewed-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 8 | ||||
| -rw-r--r-- | v4l/versions.txt | 25 |
2 files changed, 23 insertions, 10 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 17ffc7830..ab2dcb688 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -13,6 +13,14 @@ # define minor(x) MINOR(x) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +# define DEVICE_ATTR(a,b,c,d) CLASS_DEVICE_ATTR(a,b,c,d) +# define device_create_file(a,b) class_device_create_file(a,b) +# define device_remove_file(a,b) class_device_remove_file(a,b) +# device_register(a) class_device_register(a) +# device_unregister(a) class_device_unregister(a) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) # include <linux/moduleparam.h> # include <linux/delay.h> diff --git a/v4l/versions.txt b/v4l/versions.txt index 963fe9251..2b6f9f8d0 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -44,6 +44,20 @@ TUNER_3036 # Uses vm_insert_page() [2.6.15] +# Uses struct device +[2.6.13] +USB_ET61X251 +USB_SN9C102 +USB_OV511 +USB_PWC +USB_PWC_DEBUG +USB_STV680 +VIDEO_PVRUSB2 +VIDEO_PVRUSB2_24XXX +VIDEO_PVRUSB2_SYSFS +VIDEO_PVRUSB2_DEBUGIFC +VIDEO_USBVISION + [2.6.12] VIDEO_VIVI VIDEO_DEV @@ -91,10 +105,6 @@ VIDEO_SAA7127 VIDEO_UPD64031A VIDEO_UPD64083 VIDEO_IVTV -VIDEO_PVRUSB2 -VIDEO_PVRUSB2_24XXX -VIDEO_PVRUSB2_SYSFS -VIDEO_PVRUSB2_DEBUGIFC VIDEO_EM28XX DVB DVB_CORE @@ -185,8 +195,6 @@ TUNER_SIMPLE USB_VICAM USB_IBMCAM VIDEO_TLV320AIC23B -USB_PWC -USB_PWC_DEBUG VIDEO_ZORAN VIDEO_BWQCAM VIDEO_CQCAM @@ -199,9 +207,7 @@ VIDEO_CPIA_USB VIDEO_MEYE USB_DABUSB USB_DSBR -USB_OV511 USB_SE401 -USB_STV680 USB_W9968CF VIDEO_M32R_AR RADIO_CADET @@ -221,11 +227,10 @@ RADIO_TRUST RADIO_TYPHOON RADIO_TYPHOON_PROC_FS RADIO_ZOLTRIX -USB_SN9C102 VIDEO_SAA7110 SOUND_ACI_MIXER USB_KONICAWC USB_QUICKCAM_MESSENGER USB_ZC0301 -USB_ET61X251 USB_ZR364XX + |