summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:37 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:37 +0000
commit4dcf7c24b98e77f37d31c52d4d1baabcd847dc19 (patch)
tree37acade8cb6cdf0e448fa7637e4b1cfbe7edb83b
parent3f2ba4e82919656caeb64018b3a8e110c73edaa9 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
-rw-r--r--README.sgml4
-rw-r--r--src/newport_driver.c8
2 files changed, 4 insertions, 8 deletions
diff --git a/README.sgml b/README.sgml
index 15791c4..aa7e0ab 100644
--- a/README.sgml
+++ b/README.sgml
@@ -4,10 +4,10 @@
<article>
<title>Information for newport Users
-<author>Guido Günther
+<author>Guido G&uuml;nther
<date>24 February 2003
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/newport.sgml,v 1.6 2003/02/25 19:31:02 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/newport.sgml,v 1.7 2003/10/19 19:47:17 dawes Exp $
</ident>
<toc>
diff --git a/src/newport_driver.c b/src/newport_driver.c
index e55354c..f1dd100 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -30,7 +30,7 @@
* Project.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.24 2003/02/18 19:10:36 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.26 2003/08/23 15:03:08 dawes Exp $ */
/* function prototypes, common data structures & generic includes */
#include "newport.h"
@@ -297,7 +297,7 @@ NewportPreInit(ScrnInfoPtr pScrn, int flags)
/* Fill in the monitor field */
pScrn->monitor = pScrn->confScreen->monitor;
- if (!xf86SetDepthBpp(pScrn, 8, 8, 8,
+ if (!xf86SetDepthBpp(pScrn, 24, 0, 0,
Support24bppFb | SupportConvert32to24 |
PreferConvert32to24 ))
return FALSE;
@@ -570,8 +570,6 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
return FALSE;
}
-
-#ifdef XvExtension
{
XF86VideoAdaptorPtr *ptr;
int n;
@@ -581,8 +579,6 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
xf86XVScreenInit(pScreen, ptr, n);
}
}
-#endif
-
pScreen->SaveScreen = NewportSaveScreen;
/* Wrap the current CloseScreen function */