From 48922b2a7e778c38965fb5ee1db471b757fe2937 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 27 Sep 2009 17:30:21 +0100
Subject: [PATCH] --- yaml --- r: 166739 b: refs/heads/master c:
 b29cf62c43409fa2f7fbfba4e2ab230a7ac5aff8 h: refs/heads/master i:   166737:
 e7dacd5527b39f41a2d99a3a3289a538471b7c3d   166735:
 1dcda2dbdf90e30ea32dfebf1bcb5524e5845da4 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/pcmcia/sa1100_assabet.c  | 2 +-
 trunk/drivers/pcmcia/sa1100_neponset.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d507c3934f6e..abeba6c34825 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f8b7170cdda6645ed4fec4b2d415bf4cebd7839
+refs/heads/master: b29cf62c43409fa2f7fbfba4e2ab230a7ac5aff8
diff --git a/trunk/drivers/pcmcia/sa1100_assabet.c b/trunk/drivers/pcmcia/sa1100_assabet.c
index f424146a2bc9..ac8aa09ba0da 100644
--- a/trunk/drivers/pcmcia/sa1100_assabet.c
+++ b/trunk/drivers/pcmcia/sa1100_assabet.c
@@ -130,7 +130,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = {
 	.socket_suspend		= assabet_pcmcia_socket_suspend,
 };
 
-int __init pcmcia_assabet_init(struct device *dev)
+int pcmcia_assabet_init(struct device *dev)
 {
 	int ret = -ENODEV;
 
diff --git a/trunk/drivers/pcmcia/sa1100_neponset.c b/trunk/drivers/pcmcia/sa1100_neponset.c
index 4c41e86ccff9..0c76d337815b 100644
--- a/trunk/drivers/pcmcia/sa1100_neponset.c
+++ b/trunk/drivers/pcmcia/sa1100_neponset.c
@@ -123,7 +123,7 @@ static struct pcmcia_low_level neponset_pcmcia_ops = {
 	.socket_suspend 	= sa1111_pcmcia_socket_suspend,
 };
 
-int __init pcmcia_neponset_init(struct sa1111_dev *sadev)
+int pcmcia_neponset_init(struct sa1111_dev *sadev)
 {
 	int ret = -ENODEV;