Merge branches 'pm-cpufreq' and 'pm-cpuidle'

[linux-2.6-microblaze.git] / include / linux / pm.h

diff --git a/include/linux/pm.h b/include/linux/pm.h
index a30a4b5..47aca6b 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -590,7 +590,7 @@ struct dev_pm_info {
 #endif
 #ifdef CONFIG_PM
        struct hrtimer          suspend_timer;
-       unsigned long           timer_expires;
+       u64                     timer_expires;
        struct work_struct      work;
        wait_queue_head_t       wait_queue;
        struct wake_irq         *wakeirq;