diff --git a/[refs] b/[refs]
index 89a7d5d09136..36eeeec09d57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f9df54d6386bb632ffc00665489bb3bb3bf6ff2
+refs/heads/master: 9d6160137a8ef8bd25266ccc0f97d55863708fc6
diff --git a/trunk/drivers/char/drm/tdfx_drv.h b/trunk/drivers/char/drm/tdfx_drv.h
index a582a3db4c75..857be434379f 100644
--- a/trunk/drivers/char/drm/tdfx_drv.h
+++ b/trunk/drivers/char/drm/tdfx_drv.h
@@ -30,10 +30,6 @@
 #ifndef __TDFX_H__
 #define __TDFX_H__
 
-/* This remains constant for all DRM template files.
- */
-#define DRM(x) tdfx_##x
-
 /* General customization:
  */