summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/sa1100_generic.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-08-31 09:49:48 +0200
committerRussell King <rmk+kernel@armlinux.org.uk>2018-04-06 16:53:00 +0200
commit80c799dbf88d0b404e1304b469eb157e4e9e0fbf (patch)
tree084defad3fe34bb8690ba9a2589b3a8abd630dd3 /drivers/pcmcia/sa1100_generic.c
parentARM: sa1100/h3xxx: switch h3xxx PCMCIA to use gpiod APIs (diff)
downloadlinux-80c799dbf88d0b404e1304b469eb157e4e9e0fbf.tar.xz
linux-80c799dbf88d0b404e1304b469eb157e4e9e0fbf.zip
ARM: sa1100/nanoengine: convert to generic CF sockets
Convert nanoengine to use the generic CF socket support. Makefile fix from Arnd Bergmann <arnd@arndb.de>. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/pcmcia/sa1100_generic.c')
-rw-r--r--drivers/pcmcia/sa1100_generic.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
index 110365e998b8..59a670f330b7 100644
--- a/drivers/pcmcia/sa1100_generic.c
+++ b/drivers/pcmcia/sa1100_generic.c
@@ -101,9 +101,6 @@ static int (*sa11x0_pcmcia_legacy_hw_init[])(struct device *dev) = {
#if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600)
pcmcia_h3600_init,
#endif
-#ifdef CONFIG_SA1100_NANOENGINE
- pcmcia_nanoengine_init,
-#endif
#ifdef CONFIG_SA1100_SHANNON
pcmcia_shannon_init,
#endif