]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 33ae0cd) | patch
V4L/DVB (7789b): Fix merge conflicts
authorMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 30 Apr 2008 02:02:33 +0000 (23:02 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 30 Apr 2008 02:02:33 +0000 (23:02 -0300)
commitff138171ec6f84f311fe8c0395ad7f9e6d04feec
tree7ad0ecafefb46988a6f8a69fd3fd6c43afa7b7d0tree | snapshot
parent33ae0cdd3eaba219e7c2f0647b6db4be540e2130commit | diff
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 <mchehab@infradead.org>
drivers/media/video/cx18/Kconfig diff | blob | history
drivers/media/video/cx18/cx18-driver.c diff | blob | history
drivers/media/video/tuner-core.c diff | blob | history
Linux 2.6 source tree