[PATCH] fix bad merge in drivers/video/Config.in (linuxppc-2.4)

[Andreas Oberritter]

Hi,

menuconfig didn't work anymore because of invalid syntax in Config.in.
Please apply.

Regards,
Andreas
-------------- next part --------------
===== drivers/video/Config.in 1.34 vs edited =====
--- 1.34/drivers/video/Config.in	Tue Sep 16 07:20:21 2003
+++ edited/drivers/video/Config.in	Mon Oct 13 20:48:45 2003
@@ -425,7 +425,7 @@
 	      "$CONFIG_FB_INTEL" = "m" -o \
 	      "$CONFIG_FB_SGIVW" = "m" -o "$CONFIG_FB_SIS" = "m" -o \
 	      "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" -o \
-	      "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_STI" = "m" ]; then
+	      "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_STI" = "m" -o \
 	      "$CONFIG_FB_XILINX" = "m" ]; then
 	    define_tristate CONFIG_FBCON_CFB32 m
 	 fi