From a113ff982e86d1329d422a9b6d0246d51b927f49 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 19 Dec 2006 18:04:33 +1100
Subject: [PATCH] --- yaml --- r: 44746 b: refs/heads/master c:
 f9841a8d6018f8bcba77e75c9e368d94f1f22933 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/drm/drmP.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cfd9bb7ceef4..3de7d68847c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83a9e29b0fd753c28e3979d638a8ebfd3f6ebc96
+refs/heads/master: f9841a8d6018f8bcba77e75c9e368d94f1f22933
diff --git a/trunk/drivers/char/drm/drmP.h b/trunk/drivers/char/drm/drmP.h
index e31af6748584..6dcdceb81203 100644
--- a/trunk/drivers/char/drm/drmP.h
+++ b/trunk/drivers/char/drm/drmP.h
@@ -1142,9 +1142,5 @@ extern void *drm_calloc(size_t nmemb, size_t size, int area);
 extern unsigned long drm_core_get_map_ofs(drm_map_t * map);
 extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
 
-#ifndef pci_pretty_name
-#define pci_pretty_name(dev) ""
-#endif
-
 #endif				/* __KERNEL__ */
 #endif