diff --git a/[refs] b/[refs] index 30c71e4a3fe8..2ff5dcc69572 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcbc9169ed3ce7cd12328fec8b9eb9f7b91ce130 +refs/heads/master: f8d878ddbb3c08bc2f876975df674484208536ac diff --git a/trunk/drivers/power/s3c_adc_battery.c b/trunk/drivers/power/s3c_adc_battery.c index 4255f2358b13..d36c289aaef5 100644 --- a/trunk/drivers/power/s3c_adc_battery.c +++ b/trunk/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_battery_suspend NULL -#define s3c_adc_battery_resume NULL +#define s3c_adc_bat_suspend NULL +#define s3c_adc_bat_resume NULL #endif static struct platform_driver s3c_adc_bat_driver = {