git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
mfd
/
tps65911-comparator.c
diff --git
a/drivers/mfd/tps65911-comparator.c
b/drivers/mfd/tps65911-comparator.c
index
283ac67
..
e7ff783
100644
(file)
--- a/
drivers/mfd/tps65911-comparator.c
+++ b/
drivers/mfd/tps65911-comparator.c
@@
-157,6
+157,8
@@
static __devexit int tps65911_comparator_remove(struct platform_device *pdev)
struct tps65910 *tps65910;
tps65910 = dev_get_drvdata(pdev->dev.parent);
+ device_remove_file(&pdev->dev, &dev_attr_comp2_threshold);
+ device_remove_file(&pdev->dev, &dev_attr_comp1_threshold);
return 0;
}