Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7064d209 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

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: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 89001446

drivers/mmc/host/mmci.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -619,6 +619,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) 
	writel(0, host->base + MMCIMASK1);

	writel(0, host->base + MMCIMASK1);

	writel(0xfff, host->base + MMCICLEAR);

	writel(0xfff, host->base + MMCICLEAR);





#ifdef CONFIG_GPIOLIB

	if (gpio_is_valid(plat->gpio_cd)) {

	if (gpio_is_valid(plat->gpio_cd)) {

		ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)");

		ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)");

		if (ret == 0)

		if (ret == 0)
@@ -637,6 +638,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) 
		else if (ret != -ENOSYS)

		else if (ret != -ENOSYS)

			goto err_gpio_wp;

			goto err_gpio_wp;

	}

	}

#endif





	ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);

	ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);

	if (ret)

	if (ret)