From 7a3dd8ddc6a249da90e9e1e9b234442c289f1260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Thu, 2 Sep 2010 09:14:21 +0100
Subject: [PATCH] --- yaml --- r: 212407 b: refs/heads/master c:
 055d1965161bde96207371e7d31eb776c0f7790d h: refs/heads/master i:   212405:
 b92b03c4224ecec201aa21087abd24dc015ff116   212403:
 6843ed7661d100ad92d6ba08932dcb1b9d396938   212399:
 6850f8cfccd3aa9d40ddbbd63725ac7911fccdbb 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 a78640162428..1eaae649892e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f5336915bc47947230290a1a384de95803f815a
+refs/heads/master: 055d1965161bde96207371e7d31eb776c0f7790d
diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c
index 517d50ddbeb3..c0258a8c103b 100644
--- a/trunk/arch/arm/common/sa1111.c
+++ b/trunk/arch/arm/common/sa1111.c
@@ -678,7 +678,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
  *	%-EBUSY		physical address already marked in-use.
  *	%0		successful.
  */
-static int
+static int __devinit
 __sa1111_probe(struct device *me, struct resource *mem, int irq)
 {
 	struct sa1111 *sachip;