From 73a163d01131b44ca147134b976089426d262ecd Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:24:26 -0500
Subject: [PATCH] --- yaml --- r: 336898 b: refs/heads/master c:
 21fb7674c972a73a2dc0954aeeac5929b7fb3e86 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 94bfdff96a64..bfe2947a91a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34cdf25a126f053698d549cc12a9c30e9a8a0bab
+refs/heads/master: 21fb7674c972a73a2dc0954aeeac5929b7fb3e86
diff --git a/trunk/drivers/pcmcia/sa1100_generic.c b/trunk/drivers/pcmcia/sa1100_generic.c
index 113bd4e978db..ff8a027a4afb 100644
--- a/trunk/drivers/pcmcia/sa1100_generic.c
+++ b/trunk/drivers/pcmcia/sa1100_generic.c
@@ -43,7 +43,7 @@
 
 int __init pcmcia_collie_init(struct device *dev);
 
-static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = {
+static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
 #ifdef CONFIG_SA1100_ASSABET
 	pcmcia_assabet_init,
 #endif