diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-03 23:45:16 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-03 23:45:16 +0100 |
| commit | 84a73014d86fd660822a20c032625e3afe99ca58 (patch) | |
| tree | 9e42a2d3c40730947ae18363d00e8a0ee2743792 /drivers/pinctrl/nomadik/pinctrl-abx500.c | |
| parent | Input: alps - only the Dell Latitude D420/430/620/630 have separate stick but... (diff) | |
| parent | Input: evdev - fix bug in checking duplicate clock change request (diff) | |
| download | linux-84a73014d86fd660822a20c032625e3afe99ca58.tar.xz linux-84a73014d86fd660822a20c032625e3afe99ca58.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/pinctrl/nomadik/pinctrl-abx500.c')
| -rw-r--r-- | drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 557d0f2a3031..97681fac082e 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c @@ -787,7 +787,6 @@ static const struct pinmux_ops abx500_pinmux_ops = { .set_mux = abx500_pmx_set, .gpio_request_enable = abx500_gpio_request_enable, .gpio_disable_free = abx500_gpio_disable_free, - .strict = true, }; static int abx500_get_groups_cnt(struct pinctrl_dev *pctldev) |