Changeset View
Changeset View
Standalone View
Standalone View
head/x11-drivers/xf86-video-i128/files/patch-src_i128__driver.c
# two upstream clean-up commits plus a string const fix | |||||
# | |||||
--- src/i128_driver.c.orig 2012-07-17 05:21:15 UTC | --- src/i128_driver.c.orig 2012-07-17 05:21:15 UTC | ||||
+++ src/i128_driver.c | +++ src/i128_driver.c | ||||
@@ -50,8 +50,6 @@ | @@ -50,12 +50,9 @@ | ||||
/* All drivers initialising the SW cursor need this */ | /* All drivers initialising the SW cursor need this */ | ||||
#include "mipointer.h" | #include "mipointer.h" | ||||
-/* All drivers implementing backing store need this */ | -/* All drivers implementing backing store need this */ | ||||
-#include "mibstore.h" | -#include "mibstore.h" | ||||
#include "micmap.h" | #include "micmap.h" | ||||
#include "xf86DDC.h" | #include "xf86DDC.h" | ||||
@@ -1557,7 +1555,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) | -#include "vbe.h" | ||||
#include "xf86cmap.h" | |||||
#include "fb.h" | |||||
@@ -586,7 +583,7 @@ I128PreInit(ScrnInfoPtr pScrn, int flags | |||||
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n"); | |||||
} else { | |||||
int from = X_DEFAULT; | |||||
- char *s = xf86GetOptValString(pI128->Options, OPTION_ACCELMETHOD); | |||||
+ const char *s = xf86GetOptValString(pI128->Options, OPTION_ACCELMETHOD); | |||||
pI128->NoAccel = FALSE; | |||||
if (!xf86NameCmp(s, "EXA")) { | |||||
pI128->exa = TRUE; | |||||
@@ -1557,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) | |||||
return FALSE; | return FALSE; | ||||
} | } | ||||
- miInitializeBackingStore(pScreen); | - miInitializeBackingStore(pScreen); | ||||
xf86SetBackingStore(pScreen); | xf86SetBackingStore(pScreen); | ||||
xf86SetSilkenMouse(pScreen); | xf86SetSilkenMouse(pScreen); | ||||