From: Mauro Carvalho Chehab Date: Wed, 30 Apr 2008 02:02:33 +0000 (-0300) Subject: V4L/DVB (7789b): Fix merge conflicts X-Git-Tag: v2.6.26-rc1~344^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff138171ec6f84f311fe8c0395ad7f9e6d04feec;p=pandora-kernel.git V4L/DVB (7789b): Fix merge conflicts Some Kconfig names were changed. This patch reapplies the rename script, fixing for those drivers merged after the patch that renamed those items. Signed-off-by: Mauro Carvalho Chehab --- Reading git-diff-tree failed