diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-03-07 10:32:18 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-03-07 10:32:18 +0000 |
| commit | 1c1bdab01b2e9e3e02324284d5c250b1c284c844 (patch) | |
| tree | a61b62e2ba43f1b7ef0c6a5df6c2f6158a4fbf7e | |
| parent | b4c87ecb2a07787d3c851d9371c471153e9ccc4b (diff) | |
update to xf86-video-tseng 1.2.1
| -rw-r--r-- | driver/xf86-video-tseng/configure.ac | 2 | ||||
| -rw-r--r-- | driver/xf86-video-tseng/src/tseng.h | 3 | ||||
| -rw-r--r-- | driver/xf86-video-tseng/src/tseng_driver.c | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/driver/xf86-video-tseng/configure.ac b/driver/xf86-video-tseng/configure.ac index 549b16f2f..2fd20f790 100644 --- a/driver/xf86-video-tseng/configure.ac +++ b/driver/xf86-video-tseng/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) diff --git a/driver/xf86-video-tseng/src/tseng.h b/driver/xf86-video-tseng/src/tseng.h index 6af1185d1..fbb0fd31c 100644 --- a/driver/xf86-video-tseng/src/tseng.h +++ b/driver/xf86-video-tseng/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" diff --git a/driver/xf86-video-tseng/src/tseng_driver.c b/driver/xf86-video-tseng/src/tseng_driver.c index 67cc23171..46fc3aed8 100644 --- a/driver/xf86-video-tseng/src/tseng_driver.c +++ b/driver/xf86-video-tseng/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) |