[parisc-linux-cvs] linux deller

[Helge Deller]

--------------Boundary-00=_248X1F1YIHV619DL20CM
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 8bit

On Saturday 02 February 2002 20:46, Helge Deller wrote:
> CVSROOT:	/var/cvs
> Module name:	linux
> Changes by:	deller	02/02/02 12:46:52
>
> Modified files:
> 	drivers/video/sti: sticore.c
>
> Log message:
> add #if 1 / #endif around the c3k VisEG PCI work-around, it easier to
> enable/disable

--------------Boundary-00=_248X1F1YIHV619DL20CM
Content-Type: text/plain;
  charset="iso-8859-1";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff"

Index: sticore.c
===================================================================
RCS file: /var/cvs/linux/drivers/video/sti/sticore.c,v
retrieving revision 1.33
diff -u -p -r1.33 sticore.c
--- sticore.c	2002/01/28 22:54:40	1.33
+++ sticore.c	2002/02/02 19:45:58
@@ -936,10 +936,11 @@ static int __devinit sticore_pci_init(st
 	/* XXX */
 	/* A Visualize EG PCI graphics card in a c3000 would crash the machine. */
 	/* This is an ugly work-around */
-#warning "FIXME: VisEG PCI graphic card crashes c3000"
 	switch (CPU_HVERSION) {
 	case 0x5BB:
 	case 0x5BC:
+#if 1
+#warning "FIXME: VisEG PCI graphic card crashes c3000"
 		if (pd->device == 0x1005) { /* "A4977A Visualize EG" */
 			printk("I'm not trying to set up the PCI graphic card now... "
 				"It would freeze your machine !\n");
@@ -947,6 +948,7 @@ static int __devinit sticore_pci_init(st
 			break;
 		}
 		/* fall through */
+#endif
 	default:
 		sti = sti_try_rom_generic(rom_base, fb_base, pd);
 		if (sti) {

--------------Boundary-00=_248X1F1YIHV619DL20CM--