diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-04-11 09:44:37 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2014-04-11 09:44:37 +0200 |
| commit | b50da3b96c212086cb58501dbe988d64f1f35b6d (patch) | |
| tree | 2fb652ab7130d2e004c3a11a6c5ad066b0ef361f | |
| parent | ed0cfbb4fe77146b0b38f777bc28f3a4ea6da07f (diff) | |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | src/radeon_kms.c | 2 | ||||
| -rw-r--r-- | src/radeon_probe.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index f7f0a0d6..fb93f8ad 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -593,7 +593,7 @@ static int radeon_get_drm_master_fd(ScrnInfoPtr pScrn) char *busid; int fd; -#if defined(ODEV_ATTRIB_FD) +#ifdef XF86_PDEV_SERVER_FD if (pRADEONEnt->platform_dev) { fd = xf86_get_platform_device_int_attrib(pRADEONEnt->platform_dev, ODEV_ATTRIB_FD, -1); diff --git a/src/radeon_probe.h b/src/radeon_probe.h index 4f5e6450..95001895 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -37,12 +37,16 @@ #define _RADEON_PROBE_H_ 1 #include <stdint.h> +#include "xorg-server.h" #include "xf86str.h" #include "xf86DDC.h" #include "randrstr.h" #include "xf86Crtc.h" + +#ifdef XSERVER_PLATFORM_BUS #include "xf86platformBus.h" +#endif #include "compat-api.h" #include "exa.h" @@ -137,7 +141,9 @@ typedef struct int fd_ref; unsigned long fd_wakeup_registered; /* server generation for which fd has been registered for wakeup handling */ int fd_wakeup_ref; +#ifdef XSERVER_PLATFORM_BUS struct xf86_platform_device *platform_dev; +#endif } RADEONEntRec, *RADEONEntPtr; extern const OptionInfoRec *RADEONOptionsWeak(void); |