Include <linux/gpio/driver.h> rather than <linux/gpio.h> Drop <linux/pinctrl/machine.h>.
Cc: Andrey Smirnov <[email protected]> Cc: Neil Armstrong <[email protected]> Signed-off-by: Linus Walleij <[email protected]> --- drivers/pinctrl/pinctrl-sx150x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c index dc1341fdc73d..63778058eec7 100644 --- a/drivers/pinctrl/pinctrl-sx150x.c +++ b/drivers/pinctrl/pinctrl-sx150x.c @@ -27,8 +27,7 @@ #include <linux/slab.h> #include <linux/of.h> #include <linux/of_device.h> -#include <linux/gpio.h> -#include <linux/pinctrl/machine.h> +#include <linux/gpio/driver.h> #include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinmux.h> -- 2.7.4
