diff options
Diffstat (limited to 'arch/arm/common/sharpsl_pm.c')
-rw-r--r-- | arch/arm/common/sharpsl_pm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 85795a765a46..5bba5255b119 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -766,9 +766,9 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) | |||
766 | info->battery_life = sharpsl_pm.battstat.mainbat_percent; | 766 | info->battery_life = sharpsl_pm.battstat.mainbat_percent; |
767 | } | 767 | } |
768 | 768 | ||
769 | static struct pm_ops sharpsl_pm_ops = { | 769 | static struct platform_suspend_ops sharpsl_pm_ops = { |
770 | .enter = corgi_pxa_pm_enter, | 770 | .enter = corgi_pxa_pm_enter, |
771 | .valid = pm_valid_only_mem, | 771 | .valid = suspend_valid_only_mem, |
772 | }; | 772 | }; |
773 | 773 | ||
774 | static int __init sharpsl_pm_probe(struct platform_device *pdev) | 774 | static int __init sharpsl_pm_probe(struct platform_device *pdev) |
@@ -800,7 +800,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) | |||
800 | 800 | ||
801 | apm_get_power_status = sharpsl_apm_get_power_status; | 801 | apm_get_power_status = sharpsl_apm_get_power_status; |
802 | 802 | ||
803 | pm_set_ops(&sharpsl_pm_ops); | 803 | suspend_set_ops(&sharpsl_pm_ops); |
804 | 804 | ||
805 | mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250)); | 805 | mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250)); |
806 | 806 | ||
@@ -809,7 +809,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev) | |||
809 | 809 | ||
810 | static int sharpsl_pm_remove(struct platform_device *pdev) | 810 | static int sharpsl_pm_remove(struct platform_device *pdev) |
811 | { | 811 | { |
812 | pm_set_ops(NULL); | 812 | suspend_set_ops(NULL); |
813 | 813 | ||
814 | device_remove_file(&pdev->dev, &dev_attr_battery_percentage); | 814 | device_remove_file(&pdev->dev, &dev_attr_battery_percentage); |
815 | device_remove_file(&pdev->dev, &dev_attr_battery_voltage); | 815 | device_remove_file(&pdev->dev, &dev_attr_battery_voltage); |