summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/sa1100_generic.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-10-31 02:39:02 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-10-31 02:39:02 +0300
commit77bb86a1b9f8b872d8efc33c4f4359f809220252 (patch)
tree3f0b5980d340cdec48700ab398ea9a4b1e48ee5a /drivers/pcmcia/sa1100_generic.c
parent1753298947afe5eb56da755bc057f1868f345ec1 (diff)
downloadlinux-77bb86a1b9f8b872d8efc33c4f4359f809220252.tar.xz
[ARM] Support pcmcia slot on sharp sl-5500
This adds support for pcmcia slot on sharp zaurus sl-5500. pxa2xx_sharpsl.c thus becomes quite miss-named, but I guess that is not worth fixing? Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/sa1100_generic.c')
-rw-r--r--drivers/pcmcia/sa1100_generic.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index b768fa81f043..acf60ffc8a12 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -38,8 +38,12 @@
#include <pcmcia/cs.h>
#include <pcmcia/ss.h>
+#include <asm/hardware/scoop.h>
+
#include "sa1100_generic.h"
+int __init pcmcia_collie_init(struct device *dev);
+
static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
#ifdef CONFIG_SA1100_ASSABET
pcmcia_assabet_init,
@@ -56,6 +60,9 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
#ifdef CONFIG_SA1100_SIMPAD
pcmcia_simpad_init,
#endif
+#ifdef CONFIG_SA1100_COLLIE
+ pcmcia_collie_init,
+#endif
};
static int sa11x0_drv_pcmcia_probe(struct device *dev)