diff --git a/ChangeLog b/ChangeLog
index c02dfb08d..75dd992b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-01  Alan Hourihane  <alanh@fairlite.demon.co.uk>
+
+	* randr/randr.c: (RRGetRotation):
+	* randr/randrstr.h:
+	Add a new function RRGetRotation() which does exactly the same
+	thing as xf86GetRotation(), but allows for drivers to provide
+	their own RandR implementation. xf86GetRotation could be
+	obsoleted by this change.
+
 2006-01-31  Luc Verhaegen  <libv@skynet.be>
 
 	* hw/xfree86/ddc/edid.h:
diff --git a/randr/randr.c b/randr/randr.c
index 3911a3498..a0e49ab15 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -1302,6 +1302,17 @@ Bool RRRegisterRate (ScreenPtr		pScreen,
     return TRUE;
 }
 
+Rotation
+RRGetRotation(ScreenPtr pScreen)
+{
+    rrScrPriv (pScreen);
+
+    if (!pScrPriv)
+	return RR_Rotate_0;
+
+    return pScrPriv->rotation;
+}
+
 void
 RRSetCurrentConfig (ScreenPtr		pScreen,
 		    Rotation		rotation,
diff --git a/randr/randrstr.h b/randr/randrstr.h
index cd4ce3846..9dfc71efe 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -118,6 +118,9 @@ RRSetCurrentConfig (ScreenPtr		pScreen,
 
 Bool RRScreenInit(ScreenPtr pScreen);
 
+Rotation
+RRGetRotation (ScreenPtr pScreen);
+
 int
 RRSetScreenConfig (ScreenPtr		pScreen,
 		   Rotation		rotation,