summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Fufutos <fufutos610@hotmail.com>2006-04-17 22:13:39 +0300
committerLuc Verhaegen <libv@skynet.be>2006-04-18 00:04:03 +0200
commit224a64b20b9b1d72615a1e4b6bc8515e66d0a326 (patch)
tree328f4374361e1dbe6661a6dce8de11c4cec71792
parent8e87a79089cef494c8e6669ddf4e314af6bbca49 (diff)
Drop ifdef AVOID_CPIO for xf86HandleColormaps. It's identical in both cases.
-rw-r--r--src/atiscreen.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/atiscreen.c b/src/atiscreen.c
index f69cb59..0ad7555 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -544,22 +544,11 @@ ATIScreenInit
if (!miCreateDefColormap(pScreen))
return FALSE;
-#ifdef AVOID_CPIO
-
if (!xf86HandleColormaps(pScreen, 256, pATI->rgbBits, ATILoadPalette, NULL,
CMAP_PALETTED_TRUECOLOR |
CMAP_LOAD_EVEN_IF_OFFSCREEN))
return FALSE;
-#else /* AVOID_CPIO */
-
- if (!xf86HandleColormaps(pScreen, 256, pATI->rgbBits, ATILoadPalette, NULL,
- CMAP_PALETTED_TRUECOLOR |
- CMAP_LOAD_EVEN_IF_OFFSCREEN))
- return FALSE;
-
-#endif /* AVOID_CPIO */
-
/* Initialise shadow framebuffer */
if (pATI->OptionShadowFB &&
!ShadowFBInit(pScreen, ATIRefreshArea))