diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-04 22:59:22 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-04 22:59:22 -0800 |
commit | 604d11d99180806d94a9c48d76f96428dc5bcaa5 (patch) | |
tree | f4853faccfb144706dd10be1c469d726643bf072 /drivers/pinctrl/pinctrl-nomadik.c | |
parent | e28c99a85b3e9ab09944fb285c0c035fa997fa33 (diff) | |
parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
download | lwn-604d11d99180806d94a9c48d76f96428dc5bcaa5.tar.gz lwn-604d11d99180806d94a9c48d76f96428dc5bcaa5.zip |
Merge tag 'v3.8-rc6' into next/dt
Linux 3.8-rc6
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index ef21a662b974..3197870d740a 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -676,7 +676,7 @@ int nmk_gpio_set_mode(int gpio, int gpio_mode) } EXPORT_SYMBOL(nmk_gpio_set_mode); -static int nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, int gpio) +static int __maybe_unused nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, int gpio) { int i; u16 reg; |