Changeset 39708 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 6, 2012 12:42:49 PM (13 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: support OEL/RHEL6.2

File:

• trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c (modified) (4 diffs)

trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c

@@ -113 +113 @@
         .fasync = drm_fasync,
     },
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39)
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
     .pci_driver =
     {
@@ -128 +128 @@
 };
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 39)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
 static struct pci_driver pci_driver =
 {
@@ -138 +138 @@
 static int __init vboxvideo_init(void)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39)
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
     return drm_init(&driver);
 #else
@@ -147 +147 @@
 static void __exit vboxvideo_exit(void)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39)
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 39) && !defined(DRM_RHEL61)
     drm_exit(&driver);
 #else