diff options
| -rw-r--r-- | Documentation/DocBook/stmpe.tmpl | 6 | ||||
| -rw-r--r-- | drivers/gpio/gpio-nomadik.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Documentation/DocBook/stmpe.tmpl b/Documentation/DocBook/stmpe.tmpl index 6759149d6ce..9e64a00f6b3 100644 --- a/Documentation/DocBook/stmpe.tmpl +++ b/Documentation/DocBook/stmpe.tmpl @@ -101,11 +101,7 @@ <section id="stmpe-keypad.c"> <title>stmpe-keypad.c</title> !Idrivers/input/keyboard/stmpe-keypad.c - </section> - <section id="stmpe-gpio.c"> - <title>stmpe-gpio.c</title> -!Idrivers/gpio/stmpe-gpio.c - </section> + </section> </chapter> <chapter id="Other"> diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c index 839624f9fe6..d350c8d7d2d 100644 --- a/drivers/gpio/gpio-nomadik.c +++ b/drivers/gpio/gpio-nomadik.c @@ -359,7 +359,7 @@ static int __nmk_config_pins(pin_cfg_t *cfgs, int num, bool sleep) /** * nmk_config_pin - configure a pin's mux attributes * @cfg: pin confguration - * + * @sleep: Non-zero to apply the sleep mode configuration * Configures a pin's mode (alternate function or GPIO), its pull up status, * and its sleep mode based on the specified configuration. The @cfg is * usually one of the SoC specific macros defined in mach/<soc>-pins.h. These |