Fix includes according to Sebastian. Signed-off-by: Pavel Machek <pavel@xxxxxx> --- On Thu 2015-04-09 14:19:14, Sebastian Reichel wrote: > On Thu, Apr 09, 2015 at 01:29:43PM +0200, Pavel Machek wrote: > > On Thu 2015-04-09 11:10:17, Sebastian Reichel wrote: > > > On Thu, Apr 09, 2015 at 09:42:38AM +0200, Pavel Machek wrote: > > > > [...] > > > > +#include <linux/of_gpio.h> > > > > +#include <linux/gpio.h> > > > > [...] > > > > > > This should probably be > > > > > > #include <linux/of.h> > > > #include <linux/gpio/consumer.h> > > > > And I thought people would only bikesched paint on the > > Documentation. Sakari, feel free to change that, but > > > a) I don't see why Sebastian's version is better > > You neither use <linux/of_gpio.h> nor <linux/gpio.h>. > > Well "include/linux/gpio.h" describes the old gpio API. The new > gpiod gpiod API is described in "include/linux/gpio/consumer.h" and > you use it, so the include should be included ;) > > You don't use anything from "include/linux/of_gpio.h", but it > includes "include/linux/of.h", which you are using. So you should > include <linux/of.h> instead ;) diff --git a/drivers/media/i2c/adp1653.c b/drivers/media/i2c/adp1653.c index d703636..7107ac2 100644 --- a/drivers/media/i2c/adp1653.c +++ b/drivers/media/i2c/adp1653.c @@ -35,8 +35,8 @@ #include <linux/module.h> #include <linux/i2c.h> #include <linux/slab.h> -#include <linux/of_gpio.h> -#include <linux/gpio.h> +#include <linux/of.h> +#include <linux/gpio/consumer.h> #include <media/adp1653.h> #include <media/v4l2-device.h> -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
