From 58af254d744e67f874eae9dc2096f3b7cf677b75 Mon Sep 17 00:00:00 2001
From: Dmitry Artamonow <mad_soft@inbox.ru>
Date: Fri, 9 Oct 2009 12:18:49 +0400
Subject: [PATCH] --- yaml --- r: 176917 b: refs/heads/master c:
 5a134239e707b23c65948f41f40b828d40e440af h: refs/heads/master i:   176915:
 7711b0ecdd9aaef1089fc3cb35efce97e313fcf9 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/mtd/maps/sa1100-flash.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2bb988929457..1607d7f6e6cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82613b0da622efbd24cb7b23eb349966802310f1
+refs/heads/master: 5a134239e707b23c65948f41f40b828d40e440af
diff --git a/trunk/drivers/mtd/maps/sa1100-flash.c b/trunk/drivers/mtd/maps/sa1100-flash.c
index d7a47574d21e..f3af87e08ecd 100644
--- a/trunk/drivers/mtd/maps/sa1100-flash.c
+++ b/trunk/drivers/mtd/maps/sa1100-flash.c
@@ -248,7 +248,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
 		plat->exit();
 }
 
-static struct sa_info *__init
+static struct sa_info *__devinit
 sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 {
 	struct sa_info *info;