diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
| commit | a20587e3950f849deb1e723a0b4455a19f7b3fb8 (patch) | |
| tree | de0a9d0b6558f3b359acf7985ddf4b8e7e83ee24 /bsd-core/drmP.h | |
| parent | 8fd8bf599b42b6caa062afabdfce7385d59a7695 (diff) | |
| parent | 5dc5c36e624e5393b5427a159ad34e5fc358cc9f (diff) | |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/radeon_drv.h
Diffstat (limited to 'bsd-core/drmP.h')
| -rw-r--r-- | bsd-core/drmP.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h index 9732d509..1dd27282 100644 --- a/bsd-core/drmP.h +++ b/bsd-core/drmP.h @@ -76,7 +76,11 @@ typedef struct drm_file drm_file_t; #if defined(__FreeBSD__) #include <sys/rman.h> #include <sys/memrange.h> +#if __FreeBSD_version >= 800004 +#include <dev/agp/agpvar.h> +#else /* __FreeBSD_version >= 800004 */ #include <pci/agpvar.h> +#endif /* __FreeBSD_version >= 800004 */ #include <sys/agpio.h> #if __FreeBSD_version >= 500000 #include <sys/mutex.h> |