summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/sa1100_h3600.c
diff options
context:
space:
mode:
authorDmitry Artamonow <mad_soft@inbox.ru>2009-11-27 12:13:47 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 17:52:57 +0100
commite7435f866f86a9a1843dcdc2945f833b26761786 (patch)
treeb0b64d923e9334a2468b184bc18db402b7f5f47c /drivers/pcmcia/sa1100_h3600.c
parentARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keys (diff)
downloadlinux-e7435f866f86a9a1843dcdc2945f833b26761786.tar.xz
linux-e7435f866f86a9a1843dcdc2945f833b26761786.zip
ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100
Both iPAQs h3600 and h3100 share the same control GPIOs for PCMCIA, so driver can be reused. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/sa1100_h3600.c')
-rw-r--r--drivers/pcmcia/sa1100_h3600.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c
index 8706d42c9418..56329ad575a9 100644
--- a/drivers/pcmcia/sa1100_h3600.c
+++ b/drivers/pcmcia/sa1100_h3600.c
@@ -223,7 +223,7 @@ int __init pcmcia_h3600_init(struct device *dev)
{
int ret = -ENODEV;
- if (machine_is_h3600())
+ if (machine_is_h3600() || machine_is_h3100())
ret = sa11xx_drv_pcmcia_probe(dev, &h3600_pcmcia_ops, 0, 2);
return ret;