Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-msm.h

diff --git a/drivers/pinctrl/pinctrl-msm.h b/drivers/pinctrl/pinctrl-msm.h
index 6e26f1b676d75f9de3d90bcb3c1f48b1bda7d095..7b2a227a590aaf563763cd4beb5d3a06f6fc8a89 100644 (file)
--- a/drivers/pinctrl/pinctrl-msm.h
+++ b/drivers/pinctrl/pinctrl-msm.h
@@ -65,7 +65,8 @@ struct msm_pingroup {
        const unsigned *pins;
        unsigned npins;
 
-       unsigned funcs[8];
+       unsigned *funcs;
+       unsigned nfuncs;
 
        s16 ctl_reg;
        s16 io_reg;