Merge branch 'master' into modesetting

Conflicts:

	src/i830.h

1 files changed, 13 insertions, 8 deletions

diff --git a/src/i830.h b/src/i830.h
index b3a0895c..11015bfc 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -587,21 +587,26 @@ extern void I830PrintModes(ScrnInfoPtr pScrn);
 extern Bool I830CheckModeSupport(ScrnInfoPtr pScrn, int x, int y, int mode);
 extern Bool I830Rotate(ScrnInfoPtr pScrn, DisplayModePtr mode);
 extern Bool I830FixOffset(ScrnInfoPtr pScrn, I830MemRange *mem);
-extern Bool I830BindAGPMemory(ScrnInfoPtr pScrn);
-extern Bool I830UnbindAGPMemory(ScrnInfoPtr pScrn);
-extern Bool I830RandRSetConfig(ScreenPtr pScreen, Rotation rotation,
-			       int rate, RRScreenSizePtr pSize);
-extern Rotation I830GetRotation(ScreenPtr pScreen);
-extern Bool I830RandRInit(ScreenPtr pScreen, int rotation);
 extern Bool I830I2CInit(ScrnInfoPtr pScrn, I2CBusPtr *bus_ptr, int i2c_reg,
 			char *name);
-/* i830_modes.c */
-int I830ValidateXF86ModeList(ScrnInfoPtr pScrn, Bool first_time);
+
+/* i830_memory.c */
+Bool I830BindAGPMemory(ScrnInfoPtr pScrn);
+Bool I830UnbindAGPMemory(ScrnInfoPtr pScrn);
 
 /* i830_gtf.c */
 DisplayModePtr i830GetGTF(int h_pixels, int v_lines, float freq,
 			  int interlaced, int margins);
 
+/* i830_modes.c */
+int I830ValidateXF86ModeList(ScrnInfoPtr pScrn, Bool first_time);
+
+/* i830_randr.c */
+Bool I830RandRInit(ScreenPtr pScreen, int rotation);
+Bool I830RandRSetConfig(ScreenPtr pScreen, Rotation rotation, int rate,
+			RRScreenSizePtr pSize);
+Rotation I830GetRotation(ScreenPtr pScreen);
+
 /*
  * 12288 is set as the maximum, chosen because it is enough for
  * 1920x1440@32bpp with a 2048 pixel line pitch with some to spare.