projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
drivers
/
mfd
/
ab8500-gpadc.c
diff --git
a/drivers/mfd/ab8500-gpadc.c
b/drivers/mfd/ab8500-gpadc.c
index
ee9198e
..
dabbc93
100644
(file)
--- a/
drivers/mfd/ab8500-gpadc.c
+++ b/
drivers/mfd/ab8500-gpadc.c
@@
-867,7
+867,7
@@
static void ab8500_gpadc_read_calibration_data(struct ab8500_gpadc *gpadc)
gpadc->cal_data[ADC_INPUT_VBAT].offset);
}
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static int ab8500_gpadc_runtime_suspend(struct device *dev)
{
struct ab8500_gpadc *gpadc = dev_get_drvdata(dev);