From 239157ad60c86aec46ce81bfce593572022ba7e6 Mon Sep 17 00:00:00 2001 From: Alberto Panizzo Date: Wed, 10 Mar 2010 15:23:50 -0800 Subject: [PATCH] --- yaml --- r: 187305 b: refs/heads/master c: 582ef52a5d5650931f6d76c81d824bd98419ac8a h: refs/heads/master i: 187303: f19570eff8b6b4ddab6db8091d5efe84657b3341 v: v3 --- [refs] | 2 +- trunk/drivers/w1/masters/mxc_w1.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d3c792401ed4..001a2a783311 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6786073927c3ff3eb7fc3d2192e761e86fa0d352 +refs/heads/master: 582ef52a5d5650931f6d76c81d824bd98419ac8a diff --git a/trunk/drivers/w1/masters/mxc_w1.c b/trunk/drivers/w1/masters/mxc_w1.c index 65244c02551b..492670358cbf 100644 --- a/trunk/drivers/w1/masters/mxc_w1.c +++ b/trunk/drivers/w1/masters/mxc_w1.c @@ -102,7 +102,7 @@ static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit) return ((__raw_readb(ctrl_addr)) >> 3) & 0x1; } -static int __init mxc_w1_probe(struct platform_device *pdev) +static int __devinit mxc_w1_probe(struct platform_device *pdev) { struct mxc_w1_device *mdev; struct resource *res; @@ -166,7 +166,7 @@ static int __init mxc_w1_probe(struct platform_device *pdev) /* * disassociate the w1 device from the driver */ -static int mxc_w1_remove(struct platform_device *pdev) +static int __devexit mxc_w1_remove(struct platform_device *pdev) { struct mxc_w1_device *mdev = platform_get_drvdata(pdev); struct resource *res;