Gitweb:     http://git.kernel.org/linus/582ef52a5d5650931f6d76c81d824bd98419ac8a
Commit:     582ef52a5d5650931f6d76c81d824bd98419ac8a
Parent:     6786073927c3ff3eb7fc3d2192e761e86fa0d352
Author:     Alberto Panizzo <maramaopercheseimorto@gmail.com>
AuthorDate: Wed Mar 10 15:23:50 2010 -0800
Committer:  Linus Torvalds <torvalds@linux-foundation.org>
CommitDate: Fri Mar 12 15:52:43 2010 -0800

    w1: mxc_w1: move probe() and remove() to the dev* text area
    
    This fixes the section mismatch warning for mxc_w1_probe()
    
    Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
    Cc: Sascha Hauer <s.hauer@pengutronix.de>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 drivers/w1/masters/mxc_w1.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 65244c0..4926703 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/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 @@ failed_clk:
 /*
  * 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;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html