diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-10-26 14:49:11 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-10-26 14:49:11 +0100 |
| commit | 10af309a86669878099b40cec24dbb52aca1d3ed (patch) | |
| tree | 14d90e2f06e2db2bde0aea09796fd74ad5c670eb /drivers/pinctrl/sh-pfc/pfc-r8a7795.c | |
| parent | 3f84ccf62c9fdd39d2cb1caa725663191c817b65 (diff) | |
| parent | 660c40bd9837854b3d3cc75e6ddb41cc8ac32a1d (diff) | |
Merge branch 'sh-pfc-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pfc-r8a7795.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index dce06ed02090..7ddb2adfc5a5 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -9,7 +9,6 @@ */ #include <linux/kernel.h> -#include <linux/platform_data/gpio-rcar.h> #include "core.h" #include "sh_pfc.h" @@ -2812,6 +2811,6 @@ const struct sh_pfc_soc_info r8a7795_pinmux_info = { .cfg_regs = pinmux_config_regs, - .gpio_data = pinmux_data, - .gpio_data_size = ARRAY_SIZE(pinmux_data), + .pinmux_data = pinmux_data, + .pinmux_data_size = ARRAY_SIZE(pinmux_data), }; |