diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 11:48:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 11:48:51 -0500 |
| commit | 5870b2c719b15cfe3f2de3e8be51bc6e17c67e7a (patch) | |
| tree | 4e07c0d5a2aeca013c38c4845229c726a14b4050 /include | |
| parent | 642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03 (diff) | |
| parent | 45f034ef205e5439a50d6f7e5f89add93131c0cc (diff) | |
Merge branch 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl
* 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl:
pinctrl: hide subsystem from the populace
pinctrl: fix "warning: 'struct pinctrl_dev' declared inside parameter list"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pinctrl/pinctrl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h index 3605e947fa90..04c011038f32 100644 --- a/include/linux/pinctrl/pinctrl.h +++ b/include/linux/pinctrl/pinctrl.h | |||
| @@ -121,6 +121,7 @@ extern const char *pinctrl_dev_get_name(struct pinctrl_dev *pctldev); | |||
| 121 | extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev); | 121 | extern void *pinctrl_dev_get_drvdata(struct pinctrl_dev *pctldev); |
| 122 | #else | 122 | #else |
| 123 | 123 | ||
| 124 | struct pinctrl_dev; | ||
| 124 | 125 | ||
| 125 | /* Sufficiently stupid default function when pinctrl is not in use */ | 126 | /* Sufficiently stupid default function when pinctrl is not in use */ |
| 126 | static inline bool pin_is_valid(struct pinctrl_dev *pctldev, int pin) | 127 | static inline bool pin_is_valid(struct pinctrl_dev *pctldev, int pin) |