diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-10 13:39:52 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-05-11 10:33:59 +0200 |
| commit | 072e82a18f72b7b7278130c79029aac59de7650b (patch) | |
| tree | 8d0b552fb2d3e3ee31c636b41b2683ee957bc59a /drivers/pinctrl/pinctrl-nomadik.c | |
| parent | 1ae4e59279b185a850ad25da4eb5a771bf36bdcb (diff) | |
| download | linux-072e82a18f72b7b7278130c79029aac59de7650b.tar.gz linux-072e82a18f72b7b7278130c79029aac59de7650b.tar.bz2 linux-072e82a18f72b7b7278130c79029aac59de7650b.zip | |
pinctrl/nomadik: !CONFIG_OF build error
a60b57e "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>
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 9b126b6d79cc..1352f3368444 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -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); clk_disable(nmk_chip->clk); +#ifdef CONFIG_OF_GPIO chip->of_node = np; +#endif ret = gpiochip_add(&nmk_chip->chip); if (ret) |