diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
| commit | 3ba181deb2871bb455315df03f5afd979fb07ce5 (patch) | |
| tree | dc68be4b837d82c81a81bb2cec14ded275766e76 /sys/dev/drm/drm_os_freebsd.h | |
| parent | a2ca83c04a73c4e1e8465a616d8bbe5118b1b05f (diff) | |
Merge from DRI CVS as of 2004-05-26. Most of the meat is new PCI IDs and a new
packet for Radeon.
Notes
Notes:
svn path=/head/; revision=130331
Diffstat (limited to 'sys/dev/drm/drm_os_freebsd.h')
| -rw-r--r-- | sys/dev/drm/drm_os_freebsd.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h index cb4cfe042ec2..24dcd10200b5 100644 --- a/sys/dev/drm/drm_os_freebsd.h +++ b/sys/dev/drm/drm_os_freebsd.h @@ -78,6 +78,8 @@ #include <sys/mutex.h> #endif +#include "dev/drm/drm_linux_list.h" + #if __FreeBSD_version >= 400006 #define __REALLY_HAVE_AGP __HAVE_AGP #endif @@ -310,6 +312,11 @@ for ( ret = 0 ; !ret && !(condition) ; ) { \ MALLOC_DECLARE(malloctype); #undef malloctype +#if __FreeBSD_version < 502109 +#define bus_alloc_resource_any(dev, type, rid, flags) \ + bus_alloc_resource(dev, type, rid, 0ul, ~0ul, 1, flags) +#endif + #if __FreeBSD_version >= 480000 #define cpu_to_le32(x) htole32(x) #define le32_to_cpu(x) le32toh(x) |