diff options
| author | Linus Torvalds | 2013-07-28 18:19:27 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2013-07-28 18:19:27 -0700 |
| commit | 76d25a5f2fbd10d97d580f2d511e6b020ca87c09 (patch) | |
| tree | 2ccc03b06ec8793e8f68d867a243c7fad1913839 /include | |
| parent | 6803f37e0955c7cc7ebe4363cf2bab5552e4716d (diff) | |
| parent | db6c2c69c27f2c4fd1e2a1c6b0b1119b1e885f8a (diff) | |
Merge tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
- Driver fixes for AM33xx, SIRF and PFC pin controllers
- Fix a compile warning from the pinctrl single-register driver
- Fix a little nasty memory leak
* tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: fix a memleak when freeing maps
pinctrl: pinctrl-single: fix compile warning when no CONFIG_PM
pinctrl: sh-pfc: fix SDHI0 VccQ regulator on sh73a0 with DT
arm/dts: sirf: fix the pingroup name mismatch between drivers and dts
pinctrl: sirf: add usp0_uart_nostreamctrl pin group for usp-uart without flowctrl
pinctrl: sirf: fix the pin number and mux bit for usp0
pinctrl: am33xx dt binding: correct include path
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/pinctrl/am33xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dt-bindings/pinctrl/am33xx.h b/include/dt-bindings/pinctrl/am33xx.h index 469e0325e6f4..2fbc804e1a45 100644 --- a/include/dt-bindings/pinctrl/am33xx.h +++ b/include/dt-bindings/pinctrl/am33xx.h @@ -5,7 +5,7 @@ #ifndef _DT_BINDINGS_PINCTRL_AM33XX_H #define _DT_BINDINGS_PINCTRL_AM33XX_H -#include <include/dt-bindings/pinctrl/omap.h> +#include <dt-bindings/pinctrl/omap.h> /* am33xx specific mux bit defines */ #undef PULL_ENA |