Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / drivers / pinctrl / pinctrl-artpec6.c

diff --git a/drivers/pinctrl/pinctrl-artpec6.c b/drivers/pinctrl/pinctrl-artpec6.c
index 986e04ac6b5bb071d21689cd596dffd9dcfacbaa..d6c9f9dcff972b285846752e9aa06f8bfb20f238 100644 (file)
--- a/drivers/pinctrl/pinctrl-artpec6.c
+++ b/drivers/pinctrl/pinctrl-artpec6.c
@@ -798,7 +798,7 @@ static int artpec6_pconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
        enum pin_config_param param;
        unsigned int arg;
        unsigned int regval;
-       unsigned int *reg;
+       void __iomem *reg;
        int i;
 
        /* Check for valid pin */