4 files changed, 14 insertions, 14 deletions

diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h
index 75f822ba573..3777e95cb22 100644
--- a/sys/dev/pci/drm/drmP.h
+++ b/sys/dev/pci/drm/drmP.h
@@ -251,7 +251,7 @@ struct drm_lock_data {
  * The high/low watermarks of bufs are only touched by the X Server, and thus
  * not concurrently accessed, so no locking is needed.
  */
-typedef struct drm_device_dma {
+struct drm_device_dma {
 	struct rwlock	 	 dma_lock;
 	struct drm_buf_entry	 bufs[DRM_MAX_ORDER+1];
 	struct drm_buf		**buflist;	/* Vector of pointers info bufs*/
@@ -265,7 +265,7 @@ typedef struct drm_device_dma {
 		_DRM_DMA_USE_AGP = 0x01,
 		_DRM_DMA_USE_SG  = 0x02
 	} flags;
-} drm_device_dma_t;
+};
 
 struct drm_agp_mem {
 	void               *handle;
@@ -423,7 +423,7 @@ struct drm_device {
 	struct drm_lock_data  lock;	/* Information on hardware lock	*/
 
 				/* DMA queues (contexts) */
-	drm_device_dma_t  *dma;		/* Optional pointer for DMA support */
+	struct drm_device_dma  *dma;		/* Optional pointer for DMA support */
 
 				/* Context support */
 	int		  irq;		/* Interrupt used by board	   */
diff --git a/sys/dev/pci/drm/drm_bufs.c b/sys/dev/pci/drm/drm_bufs.c
index 8158b2f18e1..8855aff1364 100644
--- a/sys/dev/pci/drm/drm_bufs.c
+++ b/sys/dev/pci/drm/drm_bufs.c
@@ -395,8 +395,8 @@ drm_cleanup_buf(struct drm_device *dev, struct drm_buf_entry *entry)
 void
 drm_dma_takedown(struct drm_device *dev)
 {
-	drm_device_dma_t *dma = dev->dma;
-	int i;
+	struct drm_device_dma	*dma = dev->dma;
+	int			 i;
 
 	if (dma == NULL)
 		return;
@@ -426,8 +426,8 @@ drm_free_buffer(struct drm_device *dev, struct drm_buf *buf)
 void
 drm_reclaim_buffers(struct drm_device *dev, struct drm_file *file_priv)
 {
-	drm_device_dma_t *dma = dev->dma;
-	int i;
+	struct drm_device_dma	*dma = dev->dma;
+	int			 i;
 
 	if (dma == NULL)
 		return;
@@ -477,7 +477,7 @@ drm_dma(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int
 drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc *request)
 {
-	drm_device_dma_t	*dma = dev->dma;
+	struct drm_device_dma	*dma = dev->dma;
 	struct drm_buf_entry	*entry;
 	struct drm_buf		*buf, **temp_buflist;
 	unsigned long		 agp_offset, offset;
@@ -601,7 +601,7 @@ drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc *request)
 int
 drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc *request)
 {
-	drm_device_dma_t	*dma = dev->dma;
+	struct drm_device_dma	*dma = dev->dma;
 	struct drm_buf		*buf, **temp_buflist;
 	struct drm_buf_entry	*entry;
 	int			 alignment, byte_count, count, i, order;
@@ -735,7 +735,7 @@ drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc *request)
 int
 drm_addbufs_sg(struct drm_device *dev, struct drm_buf_desc *request)
 {
-	drm_device_dma_t	*dma = dev->dma;
+	struct drm_device_dma	*dma = dev->dma;
 	struct drm_buf_entry	*entry;
 	struct drm_buf		*buf, **temp_buflist;
 	unsigned long		 agp_offset, offset;
@@ -869,7 +869,7 @@ drm_addbufs(struct drm_device *dev, struct drm_buf_desc *request)
 int
 drm_freebufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
-	drm_device_dma_t	*dma = dev->dma;
+	struct drm_device_dma	*dma = dev->dma;
 	struct drm_buf_free	*request = data;
 	struct drm_buf		*buf;
 	int			 i, idx, retcode = 0;
@@ -905,8 +905,8 @@ drm_freebufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
 int
 drm_mapbufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
+	struct drm_device_dma	*dma = dev->dma;
 	struct drm_buf_map	*request = data;
-	drm_device_dma_t	*dma = dev->dma;
 	struct vmspace		*vms;
 	struct vnode		*vn;
 	vaddr_t			 address, vaddr;
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 0bf9824ff1f..76835f4838c 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -698,7 +698,7 @@ drmmmap(dev_t kdev, off_t offset, int prot)
 		return (-1);
 
 	if (dev->dma && offset >= 0 && offset < ptoa(dev->dma->page_count)) {
-		drm_device_dma_t *dma = dev->dma;
+		struct drm_device_dma *dma = dev->dma;
 		paddr_t	phys = -1;
 
 		rw_enter_write(&dma->dma_lock);
diff --git a/sys/dev/pci/drm/mga_dma.c b/sys/dev/pci/drm/mga_dma.c
index 5bd300be9ea..4684eefcfd8 100644
--- a/sys/dev/pci/drm/mga_dma.c
+++ b/sys/dev/pci/drm/mga_dma.c
@@ -308,7 +308,7 @@ static void mga_freelist_cleanup(struct drm_device * dev)
  */
 static void mga_freelist_reset(struct drm_device * dev)
 {
-	drm_device_dma_t *dma = dev->dma;
+	struct drm_device_dma *dma = dev->dma;
 	struct drm_buf *buf;
 	drm_mga_buf_priv_t *buf_priv;
 	int i;