V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board
authorMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 30 Dec 2008 22:10:09 +0000 (19:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 2 Jan 2009 19:12:38 +0000 (17:12 -0200)
commitb0c4be8cffb3f466759ddf621a74a10093537521
treeb657a2aea55ec51eade62c713ac4c5f361ce234f
parent47aeba5addd88b178438ba9000600b9844ca0ee1
V4L/DVB (10154): saa7134: fix a merge conflict on Behold H6 board

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/saa7134/saa7134-dvb.c