From: Michael Krufky Date: Tue, 3 Oct 2006 20:16:44 +0000 (-0300) Subject: V4L/DVB (5227): Gl861: hide disabled code from upstream patch system X-Git-Tag: v2.6.21-rc2~66^2~22 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73b96c09f679dfaaf8f72b7789a277fc10618328;p=linux-2.6 V4L/DVB (5227): Gl861: hide disabled code from upstream patch system enclose disabled code inside an #if 0 block, instead of /* comments */ Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c index 1333268fc8..86964622f8 100644 --- a/drivers/media/dvb/dvb-usb/gl861.c +++ b/drivers/media/dvb/dvb-usb/gl861.c @@ -103,9 +103,6 @@ static int gl861_identify_state(struct usb_device *udev, static struct zl10353_config gl861_zl10353_config = { .demod_address = 0x1e, .no_tuner = 1, -/* - .parallel_ts = 1, -*/ }; static int gl861_frontend_attach(struct dvb_usb_adapter *adap)