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

Timestamp:

Jul 14, 2014 7:20:14 PM (11 years ago)

Author:

vboxsync

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

94989

Message:

Additions/linux/drm: small fix to work with Linux 3.16.

File:

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

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

@@ -63 +63 @@
 #endif
 
+/* The first of these was introduced when drm was generalised to work with
+ * non-PCI buses, but was removed between 3.15 and 3.16.  The second is a
+ * random definition introduced in the mean-time. */
+#if defined(DRIVER_BUS_PCI) || defined(DRIVER_PRIME)
+# define DRM_NEW_BUS_INIT 1
+#endif
+
 static struct pci_device_id pciidlist[] = {
         vboxvideo_PCI_IDS
@@ -110 +117 @@
     .fops = &driver_fops,
 #endif
-#ifndef DRIVER_BUS_PCI
+#ifndef DRM_NEW_BUS_INIT
     .pci_driver =
     {
@@ -125 +132 @@
 };
 
-#ifdef DRIVER_BUS_PCI
+#ifdef DRM_NEW_BUS_INIT
 static struct pci_driver pci_driver =
 {
@@ -135 +142 @@
 static int __init vboxvideo_init(void)
 {
-#ifndef DRIVER_BUS_PCI
+#ifndef DRM_NEW_BUS_INIT
     return drm_init(&driver);
 #else
@@ -144 +151 @@
 static void __exit vboxvideo_exit(void)
 {
-#ifndef DRIVER_BUS_PCI
+#ifndef DRM_NEW_BUS_INIT
     drm_exit(&driver);
 #else