From b74865095e6b72aa193ab0d59a134dd7f2800f5e Mon Sep 17 00:00:00 2001
From: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Date: Tue, 21 Oct 2008 19:47:22 +0100
Subject: [PATCH] --- yaml --- r: 116825 b: refs/heads/master c:
 5d43839ab9988f236cdda1ed073d6916857bc3c5 h: refs/heads/master i:   116823:
 d0e09c79e0b327ee0606c8895ec170ae23da0f7e v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/common/sa1111.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ab74e22d36b5..9cb193c3b4cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1a7fddf420b1f5a7d9a899b3388026084a67d33
+refs/heads/master: 5d43839ab9988f236cdda1ed073d6916857bc3c5
diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c
index 6094c34d9bae..47ccec95f3e8 100644
--- a/trunk/arch/arm/common/sa1111.c
+++ b/trunk/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;