diff options
| -rw-r--r-- | drivers/pcmcia/sa1100_generic.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/sa1100_h3600.c | 2 |
2 files changed, 2 insertions, 2 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 |
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) | |||
| 223 | { | 223 | { |
| 224 | int ret = -ENODEV; | 224 | int ret = -ENODEV; |
| 225 | 225 | ||
| 226 | if (machine_is_h3600()) | 226 | if (machine_is_h3600() || machine_is_h3100()) |
| 227 | ret = sa11xx_drv_pcmcia_probe(dev, &h3600_pcmcia_ops, 0, 2); | 227 | ret = sa11xx_drv_pcmcia_probe(dev, &h3600_pcmcia_ops, 0, 2); |
| 228 | 228 | ||
| 229 | return ret; | 229 | return ret; |
