diff options
| author | Jerry Snitselaar <dev@snitselaar.org> | 2012-07-10 07:16:34 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-07-10 22:53:31 +0200 |
| commit | bb39b6551e4bff392427d6ce8692dd576a388f19 (patch) | |
| tree | f8cb2f19c799fbc56e6c226472c42138883b2493 /drivers/gpio/gpio-tps65910.c | |
| parent | Merge branch 'kevin' into fixes (diff) | |
| download | linux-bb39b6551e4bff392427d6ce8692dd576a388f19.tar.xz linux-bb39b6551e4bff392427d6ce8692dd576a388f19.zip | |
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 <dev@snitselaar.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-tps65910.c')
| -rw-r--r-- | drivers/gpio/gpio-tps65910.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 |