Merge tag 'pinctrl-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[deliverable/linux.git] / include / linux / pinctrl / pinmux.h

diff --git a/include/linux/pinctrl/pinmux.h b/include/linux/pinctrl/pinmux.h
index c15395031cb30008d03f514ae5128ff550ce09fa..3097aafbeb24599ba3d9ee64946e60601b23ef13 100644 (file)
--- a/include/linux/pinctrl/pinmux.h
+++ b/include/linux/pinctrl/pinmux.h
@@ -70,8 +70,6 @@ struct pinmux_ops {
                                  unsigned * const num_groups);
        int (*enable) (struct pinctrl_dev *pctldev, unsigned func_selector,
                       unsigned group_selector);
-       void (*disable) (struct pinctrl_dev *pctldev, unsigned func_selector,
-                        unsigned group_selector);
        int (*gpio_request_enable) (struct pinctrl_dev *pctldev,
                                    struct pinctrl_gpio_range *range,
                                    unsigned offset);