Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / common / sa1111.c

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 6094c34d9baebefd199e56d5acda2b184fc83c1d..47ccec95f3e867ce5141f7e0db7bdb7f2e57667d 100644 (file)
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -939,7 +939,7 @@ static int sa1111_resume(struct platform_device *dev)
 #define sa1111_resume  NULL
 #endif
 
-static int sa1111_probe(struct platform_device *pdev)
+static int __devinit sa1111_probe(struct platform_device *pdev)
 {
        struct resource *mem;
        int irq;