Signed-off-by: Dmitry Torokhov <[email protected]>
---
drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)
Index: work/drivers/media/dvb/bt8xx/dvb-bt8xx.c
===================================================================
--- work.orig/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ work/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -893,7 +893,7 @@ static int dvb_bt8xx_probe(struct bttv_s
return 0;
}
-static int dvb_bt8xx_remove(struct bttv_sub_device *sub)
+static void dvb_bt8xx_remove(struct bttv_sub_device *sub)
{
struct dvb_bt8xx_card *card = dev_get_drvdata(&sub->dev);
@@ -911,8 +911,6 @@ static int dvb_bt8xx_remove(struct bttv_
dvb_unregister_adapter(&card->dvb_adapter);
kfree(card);
-
- return 0;
}
static struct bttv_sub_driver driver = {
Dmitry,
Your patch conflicted with another one by Jean Delaware.
Please next time send dvb or v4l patches to me c/c to
[email protected] and [email protected]
Cheers,
Mauro.
Em Dom, 2006-01-15 ?s 23:32 -0500, Dmitry Torokhov escreveu:
> Signed-off-by: Dmitry Torokhov <[email protected]>
> ---
>
> drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +---
> 1 files changed, 1 insertion(+), 3 deletions(-)
>
> Index: work/drivers/media/dvb/bt8xx/dvb-bt8xx.c
On 1/19/06, Mauro Carvalho Chehab <[email protected]> wrote:
> Dmitry,
>
> Your patch conflicted with another one by Jean Delaware.
>
> Please next time send dvb or v4l patches to me c/c to
> [email protected] and [email protected]
>
My apologies. The original change did not come from your tree, it was
a wholesale tree update, that's why I sent it to patch originator.
Next time I will make sure to CC you and V4L/DVB lists.
--
Dmitry