From 63325d4c75fef68324036c0908c4cb074ac3cf4f Mon Sep 17 00:00:00 2001
From: Mauro Ribeiro <mauro.ribeiro@hardkernel.com>
Date: Sun, 5 Jan 2014 19:38:10 +0000
Subject: [PATCH] compat for newer xorg

---
 src/compat-api.h      | 2 +-
 src/drmmode_display.c | 5 -----
 src/omap_driver.c     | 1 -
 src/omap_driver.h     | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/compat-api.h b/src/compat-api.h
index fa0f352..b74a582 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -46,7 +46,7 @@
 #define SCREEN_ARG_TYPE int
 #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
 
-#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv
+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
 
 #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
 #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index edc4df4..9fbedb1 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -58,9 +58,6 @@
 #include "compiler.h"
 #include "mipointer.h"
 
-/* All drivers implementing backing store need this */
-#include "mibstore.h"
-
 #include "micmap.h"
 
 #include "xf86DDC.h"
@@ -1598,8 +1595,6 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
 
 	TRACE_ENTER();
 
-	pScrn->canDoBGNoneRoot = TRUE;
-
 	drmmode = calloc(1, sizeof *drmmode);
 	drmmode->fd = fd;
 
diff --git a/src/omap_driver.c b/src/omap_driver.c
index 8430e2c..1dc4c5a 100644
--- a/src/omap_driver.c
+++ b/src/omap_driver.c
@@ -655,7 +655,6 @@ OMAPScreenInit(SCREEN_INIT_ARGS_DECL)
 	}
 
 	/* Initialize backing store: */
-	miInitializeBackingStore(pScreen);
 	xf86SetBackingStore(pScreen);
 
 	/* Cause the cursor position to be updated by the mouse signal handler: */
diff --git a/src/omap_driver.h b/src/omap_driver.h
index b457985..32a510c 100644
--- a/src/omap_driver.h
+++ b/src/omap_driver.h
@@ -40,7 +40,6 @@
  * XXX - figure out what can be removed..
  */
 #include "mipointer.h"
-#include "mibstore.h"
 #include "micmap.h"
 #include "colormapst.h"
 #include "xf86cmap.h"
-- 
1.8.3.2