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

Timestamp:

Nov 8, 2013 5:05:25 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90512

Message:

Additions/linux/drm: better RHEL61 fix.

File:

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

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

@@ -156 +156 @@
     .fops = &driver_fops,
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
+#ifndef DRIVER_BUS_PCI
     .pci_driver =
     {
@@ -171 +171 @@
 };
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) || defined(DRM_RHEL61)
+#ifdef DRIVER_BUS_PCI
 static struct pci_driver pci_driver =
 {
@@ -181 +181 @@
 static int __init vboxvideo_init(void)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
+#ifndef DRIVER_BUS_PCI
     return drm_init(&driver);
 #else
@@ -190 +190 @@
 static void __exit vboxvideo_exit(void)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61)
+#ifndef DRIVER_BUS_PCI
     drm_exit(&driver);
 #else