Merge branch 'master'

[linux-2.6-omap-h63xx.git] / arch / ppc / platforms / ev64260.c

diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c
index 6444760caa3ac8560748422dd285b66c7eef83d8..31e8e21e1d5cf93cf1c1aeb8d79ba4e7fd586af2 100644 (file)
--- a/arch/ppc/platforms/ev64260.c
+++ b/arch/ppc/platforms/ev64260.c
@@ -414,7 +414,7 @@ ev64260_fixup_mpsc_pdata(struct platform_device *pdev)
        return;
 }
 
-static int __init
+static int
 ev64260_platform_notify(struct device *dev)
 {
        static struct {