Commit 072e82a1 authored May 10, 2012 by Arnd Bergmann Committed by Linus Walleij May 11, 2012

pinctrl/nomadik: !CONFIG_OF build error



a60b57ed "drivers/gpio: gpio-nomadik: Add support for irqdomains" broke
building with CONFIG_OF_GPIO disabled.

Without this patch, building nhk8815_defconfig results in:

/home/arnd/linux-arm/drivers/gpio/gpio-nomadik.c: In function 'nmk_gpio_probe':
/home/arnd/linux-arm/drivers/gpio/gpio-nomadik.c:1238:6: error: 'struct gpio_chip' has no member named 'of_node'
make[3]: *** [drivers/gpio/gpio-nomadik.o] Error 1
make[2]: *** [drivers/gpio] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [drivers] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [sub-make] Error 2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent 1ae4e592

drivers/pinctrl/pinctrl-nomadik.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1235,7 +1235,9 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
	nmk_chip->lowemi = readl_relaxed(nmk_chip->addr + NMK_GPIO_LOWEMI);		nmk_chip->lowemi = readl_relaxed(nmk_chip->addr + NMK_GPIO_LOWEMI);
	clk_disable(nmk_chip->clk);		clk_disable(nmk_chip->clk);

			#ifdef CONFIG_OF_GPIO
	chip->of_node = np;		chip->of_node = np;
			#endif

	ret = gpiochip_add(&nmk_chip->chip);		ret = gpiochip_add(&nmk_chip->chip);
	if (ret)		if (ret)