configure.ac | 2 +- src/tseng.h | 3 --- src/tseng_driver.c | 6 ++++++ 3 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit 7f7e48cf5cf7512b5c1f5f3bf31eeafb201a9ad8 Author: Dave Airlie <[email protected]> Date: Mon Dec 22 15:02:32 2008 +1000 tseng 1.2.1 diff --git a/configure.ac b/configure.ac index 549b16f..2fd20f7 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tseng], - 1.2.0, + 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-tseng) commit 5de98d43ddca983a43d30a27339427b1e60ded74 Author: Adam Jackson <[email protected]> Date: Fri Aug 15 14:08:37 2008 -0400 Uninclude xf86Version.h diff --git a/src/tseng.h b/src/tseng.h index 6af1185..fbb0fd3 100644 --- a/src/tseng.h +++ b/src/tseng.h @@ -15,9 +15,6 @@ /* Everything using inb/outb, etc needs "compiler.h" */ #include "compiler.h" -/* This is used for module versioning */ -#include "xf86Version.h" - /* Drivers for PCI hardware need this */ #include "xf86PciInfo.h" commit 6312fd997afc4f739838ce53c19dcccf90900119 Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Fri Jul 18 16:24:50 2008 -0300 Remove dependency on xf1bpp and xf4bpp Not just don't include the header files. diff --git a/src/tseng_driver.c b/src/tseng_driver.c index 67cc231..46fc3ae 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -1453,18 +1453,22 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) */ switch (pScrn->bitsPerPixel) { +#if HAVE_XF1BPP case 1: ret = xf1bppScreenInit(pScreen, pTseng->FbBase, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth); break; +#endif +#if HAVE_XF4BPP case 4: ret = xf4bppScreenInit(pScreen, pTseng->FbBase, pScrn->virtualX, pScrn->virtualY, pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth); break; +#endif default: ret = fbScreenInit(pScreen, pTseng->FbBase, pScrn->virtualX, pScrn->virtualY, @@ -1493,8 +1497,10 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) } } +#if HAVE_XF1BPP /* must be after RGB ordering fixed */ if (pScrn->bitsPerPixel > 4) +#endif fbPictureInit(pScreen, 0, 0); if (pScrn->depth >= 8) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
