projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream/tidy-xen-mmu-2.6.39' of git://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
power
/
s3c_adc_battery.c
diff --git
a/drivers/power/s3c_adc_battery.c
b/drivers/power/s3c_adc_battery.c
index 4255f2358b138beb96305e832d778bef9ab15285..d36c289aaef52e1246029dd97f07f8f9d061f2f8 100644
(file)
--- a/
drivers/power/s3c_adc_battery.c
+++ b/
drivers/power/s3c_adc_battery.c
@@
-406,8
+406,8
@@
static int s3c_adc_bat_resume(struct platform_device *pdev)
return 0;
}
#else
-#define s3c_adc_bat
tery
_suspend NULL
-#define s3c_adc_bat
tery
_resume NULL
+#define s3c_adc_bat_suspend NULL
+#define s3c_adc_bat_resume NULL
#endif
static struct platform_driver s3c_adc_bat_driver = {