1c1
< /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.c,v 3.18 1994/09/24 15:12:34 dawes Exp $ */
---
> /* $XFree86: xc/programs/Xserver/hw/xfree86/accel/p9000/p9000.c,v 3.20 1994/11/26 12:44:16 dawes Exp $ */
117a118,119
>     0,			/* int s3Madjust */
>     0,			/* int s3Nadjust */
203,204c205,206
< unsigned int p9000alu[16];
< unsigned int p9000QuadAlu[16];
---
> unsigned int p9000alu[16];	/* alu src = p9000 src        */
> unsigned int p9000QuadAlu[16] ; /* alu src = p9000 foreground */
225d226
<     /* Check for linear vid mem capability */
278a280,284
>     OFLG_SET(OPTION_SW_CURSOR, &validOptions);
>     OFLG_SET(OPTION_NOACCEL, &validOptions);
>     OFLG_SET(OPTION_SYNC_ON_GREEN, &validOptions);
>     OFLG_SET(OPTION_VRAM_128, &validOptions);
>     OFLG_SET(OPTION_VRAM_256, &validOptions);
280a287
> #if 0  /* We shouldn't need this any more */
286c293,297
<     
---
> #endif
>     /* At the moment, all P9000-based boards use a icd2061a compatable
>      * programmable clock so no more differentiation than this is needed */
>     OFLG_SET(CLOCK_OPTION_PROGRAMABLE, &(p9000InfoRec.clockOptions));
> 
489a501,502
> 	    /* Set the clock synthesizer frequency */
> 	    pMode->SynthClock = p9000InfoRec.clock[pMode->Clock];
638c651
< 		       (volatile pointer) VidBase,
---
> 		       (pointer) VidBase,