diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2009-08-26 04:58:24 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-02 06:21:14 -0400 |
commit | 7064d2092df5cbff289457424969292bc4062df4 (patch) | |
tree | 5155112a8ca22a9669f60c3f68501bf99ca02a25 /drivers | |
parent | 89001446925d6da8785c3265a71316e34c6d15de (diff) |
ARM: 5685/1: Make MMCI driver compile without gpiolib
The recent addition of optional gpiolib support to check if a
card was inserted or write protected was really not optional.
It needs this ifdef to become optional so that U300 compiles,
for example.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/mmci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 5eb86a8c943b..a923ee27c09e 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c | |||
@@ -619,6 +619,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) | |||
619 | writel(0, host->base + MMCIMASK1); | 619 | writel(0, host->base + MMCIMASK1); |
620 | writel(0xfff, host->base + MMCICLEAR); | 620 | writel(0xfff, host->base + MMCICLEAR); |
621 | 621 | ||
622 | #ifdef CONFIG_GPIOLIB | ||
622 | if (gpio_is_valid(plat->gpio_cd)) { | 623 | if (gpio_is_valid(plat->gpio_cd)) { |
623 | ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)"); | 624 | ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)"); |
624 | if (ret == 0) | 625 | if (ret == 0) |
@@ -637,6 +638,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) | |||
637 | else if (ret != -ENOSYS) | 638 | else if (ret != -ENOSYS) |
638 | goto err_gpio_wp; | 639 | goto err_gpio_wp; |
639 | } | 640 | } |
641 | #endif | ||
640 | 642 | ||
641 | ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host); | 643 | ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host); |
642 | if (ret) | 644 | if (ret) |