diff options
| author | Nian Wu <nian.wu@intel.com> | 2006-11-09 21:21:17 -0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2006-11-09 21:21:17 -0800 |
| commit | 14e3f2711e90fe9a9c315d96abd4c7681539936a (patch) | |
| tree | 6a562d9035e56671eb7905bac1f3829597f109a9 /bsd-core/drmP.h | |
| parent | e2ea72187e470c2c13adbd3fba4177bd4a0ecc37 (diff) | |
| parent | d51e1bb56ca2f7858cdeac6f61a7b747c1e15b1e (diff) | |
Merge branch 'master' into crestline
Conflicts:
shared-core/i915_dma.c
Diffstat (limited to 'bsd-core/drmP.h')
| -rw-r--r-- | bsd-core/drmP.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bsd-core/drmP.h b/bsd-core/drmP.h index 074e1d2c..9ebb12ae 100644 --- a/bsd-core/drmP.h +++ b/bsd-core/drmP.h @@ -170,7 +170,7 @@ MALLOC_DECLARE(M_DRM); #define wait_queue_head_t atomic_t #define DRM_WAKEUP(w) wakeup((void *)w) #define DRM_WAKEUP_INT(w) wakeup(w) -#define DRM_INIT_WAITQUEUE(queue) do {} while (0) +#define DRM_INIT_WAITQUEUE(queue) do {(void)(queue);} while (0) #if defined(__FreeBSD__) && __FreeBSD_version < 502109 #define bus_alloc_resource_any(dev, type, rid, flags) \ @@ -270,6 +270,7 @@ extern struct cfdriver drm_cd; #endif typedef unsigned long dma_addr_t; +typedef u_int64_t u64; typedef u_int32_t u32; typedef u_int16_t u16; typedef u_int8_t u8; @@ -713,6 +714,9 @@ struct drm_device { struct drm_driver_info driver; drm_pci_id_list_t *id_entry; /* PCI ID, name, and chipset private */ + u_int16_t pci_device; /* PCI device id */ + u_int16_t pci_vendor; /* PCI vendor id */ + char *unique; /* Unique identifier: e.g., busid */ int unique_len; /* Length of unique field */ #ifdef __FreeBSD__ |