git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[sfrench/cifs-2.6.git]
/
drivers
/
leds
/
leds-mc13783.c
diff --git
a/drivers/leds/leds-mc13783.c
b/drivers/leds/leds-mc13783.c
index 06a5bb484707b47dd005504140b1fb9e649aa7b1..126ca7955f6e16f4f43cd72ec387d4a8a0fd3637 100644
(file)
--- a/
drivers/leds/leds-mc13783.c
+++ b/
drivers/leds/leds-mc13783.c
@@
-235,7
+235,7
@@
static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
MC13783_LED_Cx_PERIOD;
if (pdata->flags & MC13783_LED_TRIODE_TC3)
- reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
;
+ reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
if (ret)