summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/apm.h8
-rw-r--r--src/apm_driver.c28
2 files changed, 0 insertions, 36 deletions
diff --git a/src/apm.h b/src/apm.h
index c57e9ba..db0c7ec 100644
--- a/src/apm.h
+++ b/src/apm.h
@@ -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: