From bb39b6551e4bff392427d6ce8692dd576a388f19 Mon Sep 17 00:00:00 2001 From: Jerry Snitselaar Date: Mon, 9 Jul 2012 22:16:34 -0700 Subject: gpio/gpio-tps65910: gpio_chip.of_node referenced without CONFIG_OF_GPIO defined commit 626f9914 added code to initialize gpio_chip.of_node, but if CONFIG_OF_GPIO is not defined gps-tps65910 fails to build with an error complaining gpio_chip has no member of_node. I ran into this while doing a allyesconfig build on linux-next. Signed-off-by: Gerard Snitselaar Signed-off-by: Linus Walleij --- drivers/gpio/gpio-tps65910.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/gpio/gpio-tps65910.c') diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c index 0749f9630869..11f29c82253c 100644 --- a/drivers/gpio/gpio-tps65910.c +++ b/drivers/gpio/gpio-tps65910.c @@ -149,7 +149,9 @@ static int __devinit tps65910_gpio_probe(struct platform_device *pdev) tps65910_gpio->gpio_chip.set = tps65910_gpio_set; tps65910_gpio->gpio_chip.get = tps65910_gpio_get; tps65910_gpio->gpio_chip.dev = &pdev->dev; +#ifdef CONFIG_OF_GPIO tps65910_gpio->gpio_chip.of_node = tps65910->dev->of_node; +#endif if (pdata && pdata->gpio_base) tps65910_gpio->gpio_chip.base = pdata->gpio_base; else -- cgit v1.2.3-59-g8ed1b