diff --git a/[refs] b/[refs] index e4d744461b12..5ac4af0218e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 110e4ec5a1cfe20190e7f8c2b8b4eef369de3c99 +refs/heads/master: 962bcbc57aa244eeb1176fa2e9f65ac865cca68a diff --git a/trunk/drivers/pinctrl/core.h b/trunk/drivers/pinctrl/core.h index 97f8124b4381..e1dfdb3c144f 100644 --- a/trunk/drivers/pinctrl/core.h +++ b/trunk/drivers/pinctrl/core.h @@ -76,9 +76,7 @@ struct pinctrl { * datasheet or such * @dynamic_name: if the name of this pin was dynamically allocated * @lock: a lock to protect the descriptor structure - * @mux_requested: whether the pin is already requested by pinmux or not - * @mux_function: a named muxing function for the pin that will be passed to - * subdrivers and shown in debugfs etc + * @owner: the device holding this pin or NULL of no device has claimed it */ struct pin_desc { struct pinctrl_dev *pctldev;