diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/video/backlight/atmel-pwm-bl.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/video/backlight/atmel-pwm-bl.c')
| -rw-r--r-- | drivers/video/backlight/atmel-pwm-bl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c index 505c0823a105..2cf7ba52f67c 100644 --- a/drivers/video/backlight/atmel-pwm-bl.c +++ b/drivers/video/backlight/atmel-pwm-bl.c | |||
| @@ -158,7 +158,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) | |||
| 158 | goto err_free_pwm; | 158 | goto err_free_pwm; |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | /* Turn display off by defatult. */ | 161 | /* Turn display off by default. */ |
| 162 | retval = gpio_direction_output(pwmbl->gpio_on, | 162 | retval = gpio_direction_output(pwmbl->gpio_on, |
| 163 | 0 ^ pdata->on_active_low); | 163 | 0 ^ pdata->on_active_low); |
| 164 | if (retval) | 164 | if (retval) |