diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-02-08 12:59:33 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-04-07 10:42:39 -0400 |
| commit | 6bf81aad67c2e535b674db535840432c38ab33a5 (patch) | |
| tree | eeef5bed5010d514bc3746f7aa1a7e65df416744 | |
| parent | 7347b7d2196a6a2aed31259824321758e0265b85 (diff) | |
config: remove MFB usage as it is no longer in xserver
As of commit f31bd087e8a7f65cd588bd1d022bb18e72b2a60c
dated August 2007, xfree86 xf1bpp and xf4bpp have been removed
in the xserver.
Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/apm.h | 8 | ||||
| -rw-r--r-- | src/apm_driver.c | 28 |
3 files changed, 0 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index 9d01f74..da42039 100644 --- a/configure.ac +++ b/configure.ac @@ -72,8 +72,6 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], [#include "xorg-server.h"]) -AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[]) -AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[]) CPPFLAGS="$SAVE_CPPFLAGS" # Checks for header files. @@ -26,14 +26,6 @@ /* All drivers using the mi colormap manipulation need this */ #include "micmap.h" -/* Needed for the 1 and 4 bpp framebuffers */ -#ifdef HAVE_XF1BPP -#include "xf1bpp.h" -#endif -#ifdef HAVE_XF4BPP -#include "xf4bpp.h" -#endif - #include "fb.h" /* Drivers using the XAA interface ... */ diff --git a/src/apm_driver.c b/src/apm_driver.c index 7cb1e0a..f172bab 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -992,18 +992,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) /* Load bpp-specific modules */ switch (pScrn->bitsPerPixel) { -#ifdef HAVE_XF1BPP - case 1: - mod = "xf1bpp"; - req = "xf1bppScreenInit"; - break; -#endif -#ifdef HAVE_XF4BPP - case 4: - mod = "xf4bpp"; - req = "xf4bppScreenInit"; - break; -#endif case 8: case 16: case 24: @@ -1819,22 +1807,6 @@ ApmScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) miSetPixmapDepths(); switch (pScrn->bitsPerPixel) { -#ifdef HAVE_XF1BPP - case 1: - ret = xf1bppScreenInit(pScreen, FbBase, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, - pScrn->displayWidth); - break; -#endif -#ifdef HAVE_XF4BPP - case 4: - ret = xf4bppScreenInit(pScreen, FbBase, - pScrn->virtualX, pScrn->virtualY, - pScrn->xDpi, pScrn->yDpi, - pScrn->displayWidth); - break; -#endif case 8: case 16: case 24: |