diff --git a/[refs] b/[refs] index 1a8c07bc23e5..4f00555b1315 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 018ae93fbc6cb2c843bb899bce05328c393b373d +refs/heads/master: 1fc7ad5d393df9e69c0cfcb01b2d803dd2021277 diff --git a/trunk/drivers/clk/clk-max77686.c b/trunk/drivers/clk/clk-max77686.c index fe449c25efd1..d098f72e1d5f 100644 --- a/trunk/drivers/clk/clk-max77686.c +++ b/trunk/drivers/clk/clk-max77686.c @@ -199,7 +199,7 @@ static int max77686_clk_probe(struct platform_device *pdev) return ret; } -static int __devexit max77686_clk_remove(struct platform_device *pdev) +static int max77686_clk_remove(struct platform_device *pdev) { struct max77686_clk **max77686_clks = platform_get_drvdata(pdev); int i; diff --git a/trunk/drivers/clk/clk-wm831x.c b/trunk/drivers/clk/clk-wm831x.c index d0f1442fdae2..1b4e2281323d 100644 --- a/trunk/drivers/clk/clk-wm831x.c +++ b/trunk/drivers/clk/clk-wm831x.c @@ -399,7 +399,7 @@ static int wm831x_clk_probe(struct platform_device *pdev) return ret; } -static int __devexit wm831x_clk_remove(struct platform_device *pdev) +static int wm831x_clk_remove(struct platform_device *pdev) { struct wm831x_clk *clkdata = dev_get_drvdata(&pdev->dev);