diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 21:07:41 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-21 21:07:41 +0400 |
| commit | 8f6c1ca9be29b49b03a94c8db33998093ea809f6 (patch) | |
| tree | 2f731fb7b616140e388e2c815054e0209a7bc705 /include | |
| parent | 4459f3974ad69a0a65d89af2a31cab425708c67e (diff) | |
| parent | 4c39104da846379151b9c37cffaf8b00a5580229 (diff) | |
| download | linux-8f6c1ca9be29b49b03a94c8db33998093ea809f6.tar.xz | |
Merge tag 'pinctrl-fixes-v3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij:
- Fixed Nomadik errorpath
- Fixed documentation spelling errors
- Forward-declare struct device in a header file
- Remove some extraneous code lines when getting pinctrl states
- Correct the i.MX51 configure register number
- Fix the Nomadik keypad function group list
* tag 'pinctrl-fixes-v3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl/nomadik: add kp_b_2 keyboard function group list
pinctrl: imx51: fix .conf_reg of MX51_PAD_SD2_CMD__CSPI_MOSI
trivial: pinctrl core: remove extraneous code lines
pinctrl: header: trivial: declare struct device
Documentation/pinctrl.txt: Fix some misspelled macros
pinctrl/nomadik: fix null in irqdomain errorpath
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pinctrl/consumer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pinctrl/consumer.h b/include/linux/pinctrl/consumer.h index 6dd96fb45482..e9b7f4350844 100644 --- a/include/linux/pinctrl/consumer.h +++ b/include/linux/pinctrl/consumer.h @@ -20,6 +20,7 @@ /* This struct is private to the core and should be regarded as a cookie */ struct pinctrl; struct pinctrl_state; +struct device; #ifdef CONFIG_PINCTRL |