diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:23:27 +0100 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:23:27 +0100 |
commit | 350ab868ed4959536700fa201abd7dab562b171c (patch) | |
tree | 16f96df09fe3ac2ab1f840ab9b5b782fd89f9a43 /drivers/gpio/gpio-nomadik.c | |
parent | 7f98542d82ea8fe5caec2e3244c9ea6cfe5db5d1 (diff) | |
parent | 7dd388a9d2f34f7a04e443a9d1d83babf5fe0824 (diff) |
Merge topic branch 'core' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/gpio/gpio-nomadik.c')
-rw-r--r-- | drivers/gpio/gpio-nomadik.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c index 839624f9fe6a..d350c8d7d2d0 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 |