diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/pinctrl/machine.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/pinctrl/machine.h')
| -rw-r--r-- | include/linux/pinctrl/machine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pinctrl/machine.h b/include/linux/pinctrl/machine.h index 7d22ab00343f..e5b1716f98cc 100644 --- a/include/linux/pinctrl/machine.h +++ b/include/linux/pinctrl/machine.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/bug.h> | 15 | #include <linux/bug.h> |
| 16 | 16 | ||
| 17 | #include "pinctrl-state.h" | 17 | #include <linux/pinctrl/pinctrl-state.h> |
| 18 | 18 | ||
| 19 | enum pinctrl_map_type { | 19 | enum pinctrl_map_type { |
| 20 | PIN_MAP_TYPE_INVALID, | 20 | PIN_MAP_TYPE_INVALID, |