diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-12 09:22:27 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-12 09:22:27 +0200 |
| commit | 2ac80fc07a1479389f3d1a71fa6a230dd1153b63 (patch) | |
| tree | 071dd7595411caa58e9214e3a811ec304b1d707e /drivers/gpio | |
| parent | 7953083a0bc0b7e4887630e1330db88f42674836 (diff) | |
| parent | d5d04bb48f0eb89c14e76779bb46212494de0bec (diff) | |
| download | kernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.zip kernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.tar.gz kernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.tar.bz2 | |
fixed merge conflicts
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib-of.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index ba9876f..0dfaf20 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -195,8 +195,8 @@ static void of_gpiochip_add_pin_range(struct gpio_chip *chip) return; for (;; index++) { - ret = of_parse_phandle_with_args(np, "gpio-ranges", - "#gpio-range-cells", index, &pinspec); + ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, + index, &pinspec); if (ret) break; |