From 0c33d90f2be3bd7dd5850e7841ca3e397301246d Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:22:52 -0500
Subject: [PATCH] --- yaml --- r: 336867 b: refs/heads/master c:
 018ae93fbc6cb2c843bb899bce05328c393b373d h: refs/heads/master i:   336865:
 8994719c0e941f715e62c7af50f07e08d25b9159   336863:
 e49dd9541c942a4b545312841641bff48a13ee3d v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/clk/clk-max77686.c | 2 +-
 trunk/drivers/clk/clk-wm831x.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e83bca79677c..1a8c07bc23e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9cfa6305198f190a685e45a3d78140ea8f298a9
+refs/heads/master: 018ae93fbc6cb2c843bb899bce05328c393b373d
diff --git a/trunk/drivers/clk/clk-max77686.c b/trunk/drivers/clk/clk-max77686.c
index fff7e6f36ef1..fe449c25efd1 100644
--- a/trunk/drivers/clk/clk-max77686.c
+++ b/trunk/drivers/clk/clk-max77686.c
@@ -143,7 +143,7 @@ static int max77686_clk_register(struct device *dev,
 	return 0;
 }
 
-static __devinit int max77686_clk_probe(struct platform_device *pdev)
+static int max77686_clk_probe(struct platform_device *pdev)
 {
 	struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
 	struct max77686_clk **max77686_clks;
diff --git a/trunk/drivers/clk/clk-wm831x.c b/trunk/drivers/clk/clk-wm831x.c
index 3cbd662adcf2..d0f1442fdae2 100644
--- a/trunk/drivers/clk/clk-wm831x.c
+++ b/trunk/drivers/clk/clk-wm831x.c
@@ -350,7 +350,7 @@ static struct clk_init_data wm831x_clkout_init = {
 	.flags = CLK_SET_RATE_PARENT,
 };
 
-static __devinit int wm831x_clk_probe(struct platform_device *pdev)
+static int wm831x_clk_probe(struct platform_device *pdev)
 {
 	struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
 	struct wm831x_clk *clkdata;