moved from extra

1 files changed, 53 insertions, 0 deletions

diff --git a/git-fix.diff b/git-fix.diff
new file mode 100644
index 000000000000..de3287d1319c
--- /dev/null
+++ b/git-fix.diff
@@ -0,0 +1,53 @@
+From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 15 Aug 2012 17:03:11 +0000
+Subject: Don't bother to include vbe.h
+
+Just copied from xf86 boilerplate afaict.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 66fdee0..a0f08c0 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -55,7 +55,6 @@
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+-#include "vbe.h"
+ 
+ #include "xf86cmap.h"
+ #include "fb.h"
+--
+cgit v0.9.0.2-2-gbebe
+From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:40 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index a0f08c0..51a4135 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -50,8 +50,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+     }
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe