diff options
author | Keith Packard <keithp@keithp.com> | 2009-03-16 08:41:52 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2009-03-16 08:41:52 -0700 |
commit | 78a60e1b66fe2e8449702dd43d9b062d279af8f1 (patch) | |
tree | ee4821fdf1c475b8244528bb5bd86ebe2ecf5710 | |
parent | 1a6e70cd98abc63f24f710819961c24601afb59b (diff) |
Revert EXA_DRIVER_KNOWN_MAJOR bump
This was mistakenly added in the unrelated change in revision
fe08b81d0f5d6f96e0124e6286bd24aba6e140ad
-rw-r--r-- | src/i830.h | 1 | ||||
-rw-r--r-- | src/i830_driver.c | 5 |
2 files changed, 0 insertions, 6 deletions
@@ -77,7 +77,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i915_drm.h" #ifdef I830_USE_EXA -#define EXA_DRIVER_KNOWN_MAJOR 3 #include "exa.h" Bool I830EXAInit(ScreenPtr pScreen); unsigned long long I830TexOffsetStart(PixmapPtr pPix); diff --git a/src/i830_driver.c b/src/i830_driver.c index f104c5f1..c19fcc63 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1939,17 +1939,12 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) int errmaj, errmin; memset(&req, 0, sizeof(req)); -#if EXA_VERSION_MAJOR == 3 - req.majorversion = 3; - req.minorversion = 0; -#else req.majorversion = 2; #if EXA_VERSION_MINOR >= 2 req.minorversion = 2; #else req.minorversion = 1; #endif -#endif if (!LoadSubModule(pScrn->module, "exa", NULL, NULL, NULL, &req, &errmaj, &errmin)) { LoaderErrorMsg(NULL, "exa", errmaj, errmin); |