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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
drivers
/
power
/
s3c_adc_battery.c
diff --git
a/drivers/power/s3c_adc_battery.c
b/drivers/power/s3c_adc_battery.c
index
4255f23
..
d36c289
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 = {