pinctrl: mtk: Fix up GPIO includes

Include only <linux/gpio/driver.h> since this is a driver,
not a consumer.

Cc: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
index 7cfab0cfd18cb280015143fd70d65c89f71a5292..c27597cd3931d0ad3431c62de2634011d8eecc37 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-moore.c
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
@@ -8,6 +8,7 @@
  *
  */
 
+#include <linux/gpio/driver.h>
 #include "pinctrl-moore.h"
 
 #define PINCTRL_PINCTRL_DEV            KBUILD_MODNAME

diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.h b/drivers/pinctrl/mediatek/pinctrl-moore.h
index 74a6568a922047f68133d492dafcc7b69af2e3da..e1b4b82b9d3db47f238c0d3a5a83ef9ad7553f6b 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-moore.h
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.h
@@ -8,8 +8,6 @@
 #ifndef __PINCTRL_MOORE_H
 #define __PINCTRL_MOORE_H
 
-#include <linux/gpio.h>
-#include <linux/gpio/driver.h>
 #include <linux/io.h>
 #include <linux/init.h>
 #include <linux/of.h>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
index e8a2066a4d15ee376cfd6ba6eb7605f63d3a94f1..167ebf43c089371ccee03cc7f75c0dfba870c06a 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c
@@ -8,7 +8,7 @@
 
 #include <linux/device.h>
 #include <linux/err.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/of_irq.h>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
index e0d4e68b7cdd806e1e659e9cf023670bec6e7f1b..10d33ecaf456286b0751848345b287b77c52a98c 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
@@ -9,6 +9,8 @@
 #ifndef __PINCTRL_MTK_COMMON_V2_H
 #define __PINCTRL_MTK_COMMON_V2_H
 
+#include <linux/gpio/driver.h>
+
 #define MTK_INPUT      0
 #define MTK_OUTPUT     1
 #define MTK_DISABLE    0

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index 9f4224f9d6052de8fb868136093428a764a6c311..4cf0fea30b7debdc9c5cd57ecd1384354f354126 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -9,6 +9,7 @@
  *        Hongzhou.Yang <hongzhou.yang@mediatek.com>
  */
 
+#include <linux/gpio/driver.h>
 #include <dt-bindings/pinctrl/mt65xx.h>
 #include "pinctrl-paris.h"
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.h b/drivers/pinctrl/mediatek/pinctrl-paris.h
index e4d204e4ce8dea63c8601213fecb3115a404be82..37146caa667d8c8db363c82dd8dec2da77cccb31 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.h
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.h
@@ -9,8 +9,6 @@
 #ifndef __PINCTRL_PARIS_H
 #define __PINCTRL_PARIS_H
 
-#include <linux/gpio.h>
-#include <linux/gpio/driver.h>
 #include <linux/io.h>
 #include <linux/init.h>
 #include <linux/of.h>