From 8e7f3a12aa9a10bfda002546f3c6bbaa7b3cf3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 10 Dec 2009 17:01:13 -0300 Subject: [PATCH] --- yaml --- r: 176818 b: refs/heads/master c: 9d8938248c3b67904a8108a6fc3dcceb9d7f2aad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/davinci/vpfe_capture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bd4880014d9f..c733a866564c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50e55fd13fcf2d098e2b969c9d1bc270ae5f8b12 +refs/heads/master: 9d8938248c3b67904a8108a6fc3dcceb9d7f2aad diff --git a/trunk/drivers/media/video/davinci/vpfe_capture.c b/trunk/drivers/media/video/davinci/vpfe_capture.c index f2d3c9b6df10..87e97962ff57 100644 --- a/trunk/drivers/media/video/davinci/vpfe_capture.c +++ b/trunk/drivers/media/video/davinci/vpfe_capture.c @@ -2090,7 +2090,7 @@ static __init int vpfe_probe(struct platform_device *pdev) /* * vpfe_remove : It un-register device from V4L2 driver */ -static int vpfe_remove(struct platform_device *pdev) +static int __devexit vpfe_remove(struct platform_device *pdev) { struct vpfe_device *vpfe_dev = platform_get_drvdata(pdev); struct resource *res;