diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:12 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:12 +0200 |
| commit | 080a0882a84b5d9456ec6b4fb22ab38f598f795e (patch) | |
| tree | f48d40869af61143e250e429595fd62d39bbdfa5 /drivers/gpio/gpio-nomadik.c | |
| parent | d6573a998b2c5a6df04ae6f131ecf6a60c46c0a0 (diff) | |
| parent | c9631643fa1cb8429366c0fcce6705123387d1a2 (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 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 |