[PATCH] msp3400 quick fix

The new "simpler" opmode added by the recent merge from ivtv breaks msp3400
support for other tv cards.  Not figured yet why.

This patch disables the "simpler" mode by default (can still be enabled by
insmod option) as quick fix for 2.6.10.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/media/video/msp3400.c

@@ -1511,9 +1511,12 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
 
 	msp->opmode = opmode;
 	if (OPMODE_AUTO == msp->opmode) {
+#if 0 /* seems to work for ivtv only, disable by default for now ... */
 		if (HAVE_SIMPLER(msp))
 			msp->opmode = OPMODE_SIMPLER;
-		else if (HAVE_SIMPLE(msp))
+		else
+#endif
+		if (HAVE_SIMPLE(msp))
 			msp->opmode = OPMODE_SIMPLE;
 		else
 			msp->opmode = OPMODE_MANUAL;