From 17a1e8a8b82337b21e46e03ef2de9a3b5e284340 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Wed, 25 Jul 2012 15:05:27 +0300 Subject: [PATCH] --- yaml --- r: 324312 b: refs/heads/master c: 8c3db42fea94cc360446602d3d1a4f50ae98af16 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/w1/masters/omap_hdq.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 02d1d8fbc023..a761df607a27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09649a85adfedde99b47b6ccef3fea696fad72be +refs/heads/master: 8c3db42fea94cc360446602d3d1a4f50ae98af16 diff --git a/trunk/drivers/w1/masters/omap_hdq.c b/trunk/drivers/w1/masters/omap_hdq.c index 4b0fcf3c2d03..38b0138ce74d 100644 --- a/trunk/drivers/w1/masters/omap_hdq.c +++ b/trunk/drivers/w1/masters/omap_hdq.c @@ -73,11 +73,11 @@ struct hdq_data { }; static int __devinit omap_hdq_probe(struct platform_device *pdev); -static int omap_hdq_remove(struct platform_device *pdev); +static int __devexit omap_hdq_remove(struct platform_device *pdev); static struct platform_driver omap_hdq_driver = { .probe = omap_hdq_probe, - .remove = omap_hdq_remove, + .remove = __devexit_p(omap_hdq_remove), .driver = { .name = "omap_hdq", }, @@ -628,7 +628,7 @@ static int __devinit omap_hdq_probe(struct platform_device *pdev) } -static int omap_hdq_remove(struct platform_device *pdev) +static int __devexit omap_hdq_remove(struct platform_device *pdev) { struct hdq_data *hdq_data = platform_get_drvdata(pdev);