forked from pool/virtualbox
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
Index: VirtualBox-4.1.8_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c
|
||
|
|
===================================================================
|
||
|
|
--- VirtualBox-4.1.8_OSE.orig/src/VBox/Additions/linux/drm/vboxvideo_drm.c
|
||
|
|
+++ VirtualBox-4.1.8_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c
|
||
|
|
@@ -86,6 +86,20 @@ int vboxvideo_driver_load(struct drm_dev
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
|
||
|
|
+/* since linux-3.3.0-rc1 drm_driver::fops is pointer */
|
||
|
|
+static struct file_operations driver_fops =
|
||
|
|
+{
|
||
|
|
+ .owner = THIS_MODULE,
|
||
|
|
+ .open = drm_open,
|
||
|
|
+ .release = drm_release,
|
||
|
|
+ .unlocked_ioctl = drm_ioctl,
|
||
|
|
+ .mmap = drm_mmap,
|
||
|
|
+ .poll = drm_poll,
|
||
|
|
+ .fasync = drm_fasync,
|
||
|
|
+};
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
static struct drm_driver driver =
|
||
|
|
{
|
||
|
|
/* .driver_features = DRIVER_USE_MTRR, */
|
||
|
|
@@ -96,6 +110,7 @@ static struct drm_driver driver =
|
||
|
|
.get_map_ofs = drm_core_get_map_ofs,
|
||
|
|
.get_reg_ofs = drm_core_get_reg_ofs,
|
||
|
|
#endif
|
||
|
|
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
|
||
|
|
.fops =
|
||
|
|
{
|
||
|
|
.owner = THIS_MODULE,
|
||
|
|
@@ -112,6 +127,9 @@ static struct drm_driver driver =
|
||
|
|
.poll = drm_poll,
|
||
|
|
.fasync = drm_fasync,
|
||
|
|
},
|
||
|
|
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
|
||
|
|
+ .fops = &driver_fops,
|
||
|
|
+#endif
|
||
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39)
|
||
|
|
.pci_driver =
|
||
|
|
{
|