diff options
-rw-r--r-- | drivers/pinctrl/sh-pfc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/core.h | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/sh_pfc.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig index 9f0217bcd754..a0b6bd0b1993 100644 --- a/drivers/pinctrl/sh-pfc/Kconfig +++ b/drivers/pinctrl/sh-pfc/Kconfig | |||
@@ -5,8 +5,6 @@ | |||
5 | if ARCH_SHMOBILE || SUPERH | 5 | if ARCH_SHMOBILE || SUPERH |
6 | 6 | ||
7 | config PINCTRL_SH_PFC | 7 | config PINCTRL_SH_PFC |
8 | # XXX move off the gpio dependency | ||
9 | depends on GPIOLIB | ||
10 | select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB | 8 | select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB |
11 | select PINMUX | 9 | select PINMUX |
12 | select PINCONF | 10 | select PINCONF |
diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h index ee4a4d6dbc3c..6ec746f0339b 100644 --- a/drivers/pinctrl/sh-pfc/core.h +++ b/drivers/pinctrl/sh-pfc/core.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #define __SH_PFC_CORE_H__ | 11 | #define __SH_PFC_CORE_H__ |
12 | 12 | ||
13 | #include <linux/compiler.h> | 13 | #include <linux/compiler.h> |
14 | #include <linux/spinlock.h> | ||
14 | #include <linux/types.h> | 15 | #include <linux/types.h> |
15 | 16 | ||
16 | #include "sh_pfc.h" | 17 | #include "sh_pfc.h" |
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h index 3b785fc428d5..b1707612d24f 100644 --- a/drivers/pinctrl/sh-pfc/sh_pfc.h +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h | |||
@@ -11,8 +11,8 @@ | |||
11 | #ifndef __SH_PFC_H | 11 | #ifndef __SH_PFC_H |
12 | #define __SH_PFC_H | 12 | #define __SH_PFC_H |
13 | 13 | ||
14 | #include <linux/bug.h> | ||
14 | #include <linux/stringify.h> | 15 | #include <linux/stringify.h> |
15 | #include <asm-generic/gpio.h> | ||
16 | 16 | ||
17 | typedef unsigned short pinmux_enum_t; | 17 | typedef unsigned short pinmux_enum_t; |
18 | 18 | ||