diff options
| author | Felix Geyer <fgeyer@debian.org> | 2014-02-03 18:21:55 +0100 |
|---|---|---|
| committer | Felix Geyer <fgeyer@debian.org> | 2014-02-03 18:21:55 +0100 |
| commit | a0f18d47861c16d7dc3a1b7b8f177a076b14051e (patch) | |
| tree | d16f8bdf2acf053831c59bc3e20acac1004f7e21 /src/VBox/Additions/linux/drm | |
| parent | 1d0b96390adf6a8d181d6daad57b7228e69ec9e0 (diff) | |
| download | virtualbox-a0f18d47861c16d7dc3a1b7b8f177a076b14051e.tar.gz | |
Imported Upstream version 4.3.6-dfsgupstream/4.3.6-dfsg
Diffstat (limited to 'src/VBox/Additions/linux/drm')
| -rw-r--r-- | src/VBox/Additions/linux/drm/vboxvideo_drm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c index 7ac299e61..37b9df7e0 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c @@ -155,7 +155,7 @@ static struct drm_driver driver = #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER) */ .fops = &driver_fops, #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61) +#ifndef DRIVER_BUS_PCI .pci_driver = { .name = DRIVER_NAME, @@ -170,7 +170,7 @@ static struct drm_driver driver = .patchlevel = DRIVER_PATCHLEVEL, }; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) || defined(DRM_RHEL61) +#ifdef DRIVER_BUS_PCI static struct pci_driver pci_driver = { .name = DRIVER_NAME, @@ -180,7 +180,7 @@ static struct pci_driver pci_driver = 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 return drm_pci_init(&driver, &pci_driver); @@ -189,7 +189,7 @@ static int __init vboxvideo_init(void) 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 drm_pci_exit(&driver, &pci_driver); |