From cc8252c4a71aac17542edb6959e65924f3439e45 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@starflyer.(none)>
Date: Fri, 5 Aug 2005 23:09:14 +1000
Subject: [PATCH] --- yaml --- r: 6491 b: refs/heads/master c:
 aa0ca6b4bb818406d4769edb9ff115500c8e4090 h: refs/heads/master i:   6489:
 39e9ab7d75f6d2afbd75f4e0eada3d1ef6a11b4b   6487:
 8f5f6b2f5df515eac0b5f9eb9b90f941c5694c7c v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/char/drm/drm_pci.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 57938fbdde8a..58b12771e69e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fad99499afdd2730adb1d53413b91580b1f0662
+refs/heads/master: aa0ca6b4bb818406d4769edb9ff115500c8e4090
diff --git a/trunk/drivers/char/drm/drm_pci.c b/trunk/drivers/char/drm/drm_pci.c
index 3e452e8967fa..09ed712c1a7f 100644
--- a/trunk/drivers/char/drm/drm_pci.c
+++ b/trunk/drivers/char/drm/drm_pci.c
@@ -50,7 +50,7 @@ drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align,
 				dma_addr_t maxaddr)
 {
 	drm_dma_handle_t *dmah;
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
 	int area = DRM_MEM_DMA;
 
 	spin_lock(&drm_mem_lock);
@@ -81,7 +81,7 @@ drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, size_t align,
 	dmah->size = size;
 	dmah->vaddr = pci_alloc_consistent(dev->pdev, size, &dmah->busaddr);
 
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
 	if (dmah->vaddr == NULL) {
 		spin_lock(&drm_mem_lock);
 		++drm_mem_stats[area].fail_count;
@@ -116,14 +116,14 @@ EXPORT_SYMBOL(drm_pci_alloc);
 void
 __drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah)
 {
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
 	int area = DRM_MEM_DMA;
 	int alloc_count;
 	int free_count;
 #endif
 
 	if (!dmah->vaddr) {
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
 		DRM_MEM_ERROR(area, "Attempt to free address 0\n");
 #endif
 	} else {
@@ -131,7 +131,7 @@ __drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah)
 				    dmah->busaddr);
 	}
 
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
 	spin_lock(&drm_mem_lock);
 	free_count = ++drm_mem_stats[area].free_count;
 	alloc_count = drm_mem_stats[area].succeed_count;