diff options
| author | Jordan Crouse <jordan.crouse@amd.com> | 2008-03-14 16:38:21 -0600 |
|---|---|---|
| committer | Jordan Crouse <jordan.crouse@amd.com> | 2008-03-14 16:38:21 -0600 |
| commit | e93660928499f963d477720b628a05e8d14ea197 (patch) | |
| tree | 118d3a22900703b01b4622316dec1cd0903ee59c /src/gx_driver.c | |
| parent | c42454a5d1fba9dc0ef4d671cb839108ef827ec9 (diff) | |
amd: Missed a merge artifact - kick me in the head for breaking tinderbox
Diffstat (limited to 'src/gx_driver.c')
| -rw-r--r-- | src/gx_driver.c | 1 |
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; |