]> err.no Git - linux-2.6/commit
[PATCH] v4l: (963.1) hybrid v4l/dvb: remove duplicated code
authorMichael Krufky <mkrufky@m1k.net>
Mon, 14 Nov 2005 00:08:03 +0000 (16:08 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 14 Nov 2005 02:14:20 +0000 (18:14 -0800)
commit9e1e28da4059ce293334a8e820955a0ce320b07b
tree93414b7dd29e77754bf9fc3f9dc553482be11ab2
parent6555f4322f5c8dc03047eb566d8519ba348e02de
[PATCH] v4l: (963.1) hybrid v4l/dvb: remove duplicated code

The following patch caused some duplicated code in cx88-dvb.c:
[PATCH] v4l: 634: implemented tuner set standby on cx88 init

The cx88-dvb.c portion of this patch was already applied
in an earlier patch, entitled:
[PATCH] v4l: fixup on cx88_dvb for Dvico HDTV5 Gold

I love quilt and all, but AFAIK, no tool is 100% perfect for catching
oversights like this.

The non-overlapping portions of each of these patches are still needed, and
must not be discarded, so rather than reverting old patches, please just apply
this fixup patch to remove the duplicated code.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/media/video/cx88/cx88-dvb.c