summaryrefslogtreecommitdiff
path: root/src/gx_driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gx_driver.c')
-rw-r--r--src/gx_driver.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gx_driver.c b/src/gx_driver.c
index 8f0106d..66aa31c 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -539,7 +539,6 @@ GXPreInit(ScrnInfoPtr pScrni, int flags)
if (xf86ReturnOptValBool(GeodeOptions, GX_OPTION_NOACCEL, FALSE))
pGeode->NoAccel = TRUE;
->>>>>>> patched
pGeode->rotation = RR_Rotate_0;