> +#else > +static struct device_node *of_find_gpio(struct device *dev, const char *id > + unsigned int idx, unsigned long flags) > +{ > + return ERR_PTR(-ENODEV); > +} > +#endif ... and of course I forgot to fix the main compilation error. Linus, would you mind squashing what follows into this patch? Apologies for the inconvenience. diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 05b9981..e1d1a15 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2172,8 +2172,8 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, return desc; } #else -static struct device_node *of_find_gpio(struct device *dev, const char *id - unsigned int idx, unsigned long flags) +static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, + unsigned int idx, unsigned long *flags) { return ERR_PTR(-ENODEV); } -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html