diff options
| author | Linus Walleij | 2009-08-26 10:58:24 +0200 |
|---|---|---|
| committer | Russell King | 2009-09-02 12:21:14 +0200 |
| commit | 7064d2092df5cbff289457424969292bc4062df4 (patch) | |
| tree | 5155112a8ca22a9669f60c3f68501bf99ca02a25 /drivers/mmc | |
| parent | MMC: MMCI: use gpiolib for card detect/write protect (diff) | |
| download | kernel-qcow2-linux-7064d2092df5cbff289457424969292bc4062df4.tar.gz kernel-qcow2-linux-7064d2092df5cbff289457424969292bc4062df4.tar.xz kernel-qcow2-linux-7064d2092df5cbff289457424969292bc4062df4.zip | |
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/mmc')
| -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) writel(0, host->base + MMCIMASK1); writel(0xfff, host->base + MMCICLEAR); +#ifdef CONFIG_GPIOLIB if (gpio_is_valid(plat->gpio_cd)) { ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)"); if (ret == 0) @@ -637,6 +638,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) else if (ret != -ENOSYS) goto err_gpio_wp; } +#endif ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host); if (ret) |