diff options
author | Dmitry Artamonow <mad_soft@inbox.ru> | 2009-11-27 06:13:47 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 11:52:57 -0500 |
commit | e7435f866f86a9a1843dcdc2945f833b26761786 (patch) | |
tree | b0b64d923e9334a2468b184bc18db402b7f5f47c /drivers/pcmcia/sa1100_generic.c | |
parent | c463eb62ac5bd8c26578cae42e1d5bb397aed100 (diff) |
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_generic.c')
-rw-r--r-- | drivers/pcmcia/sa1100_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 11cc3ba1260a..8db86b90c200 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c | |||
@@ -51,7 +51,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = { | |||
51 | #ifdef CONFIG_SA1100_CERF | 51 | #ifdef CONFIG_SA1100_CERF |
52 | pcmcia_cerf_init, | 52 | pcmcia_cerf_init, |
53 | #endif | 53 | #endif |
54 | #ifdef CONFIG_SA1100_H3600 | 54 | #if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600) |
55 | pcmcia_h3600_init, | 55 | pcmcia_h3600_init, |
56 | #endif | 56 | #endif |
57 | #ifdef CONFIG_SA1100_SHANNON | 57 | #ifdef CONFIG_SA1100_SHANNON |