Re: [PATCH][2.4] was: Matrox FB problem in latest 2.4.21-rc1-BK

bunk@fs.tum.de
Sun, 27 Apr 2003 11:15:06 +0200


On Sun, Apr 27, 2003 at 10:57:11AM +0200, Willy TARREAU wrote:

> Hi again,
>
> OK I found it to be a typo in cset-1.1134 (intel fb fixes) which disabled CFB8.
> It now works with this patch. Christoph, you might also have the typo in your
> tree.

The patch below fixes another place in the same file:
I'm not sure whether the new "y"-o (no space) gets correctly parsed by
all config tools, but the "$CONFIG_FB_STI" = "y" (not introduced by the
recent patch) seems to be definitely wrong.

> Cheers,
> Willy
>...

cu
Adrian

--- linux-2.4.21-rc1-modular/drivers/video/Config.in.old 2003-04-27 11:05:53.000000000 +0200
+++ linux-2.4.21-rc1-modular/drivers/video/Config.in 2003-04-27 11:06:52.000000000 +0200
@@ -299,7 +299,7 @@
"$CONFIG_FB_PMAG_BA" = "y" -o "$CONFIG_FB_PMAGB_B" = "y" -o \
"$CONFIG_FB_MAXINE" = "y" -o "$CONFIG_FB_TX3912" = "y" -o \
"$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_NEOMAGIC" = "y" -o \
- "$CONFIG_FB_STI" = "y" -o "$CONFIG_FB_HP300" = "y" -o
+ "$CONFIG_FB_STI" = "y" -o "$CONFIG_FB_HP300" = "y" -o \
"$CONFIG_FB_INTEL" = "y" ]; then
define_tristate CONFIG_FBCON_CFB8 y
else
@@ -402,7 +402,7 @@
"$CONFIG_FB_3DFX" = "m" -o "$CONFIG_FB_RADEON" = "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" = "y"-o \
+ "$CONFIG_FB_CYBER2000" = "m" -o "$CONFIG_FB_STI" = "m" -o \
"$CONFIG_FB_INTEL" = "m" ]; then
define_tristate CONFIG_FBCON_CFB32 m
fi
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/