diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 10:00:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 10:00:05 -0800 |
| commit | 193cb93e5a5f32c0520eed17e87135d20594d1e1 (patch) | |
| tree | 3b5584f4e5e73f5f01807e5176cbe29e1db69868 /drivers/rtc/rtc-pxa.c | |
| parent | 23e707dd9b0b26215d801c59e87feed1c218a0f9 (diff) | |
| parent | f42ecb2808db5386f983d593a7c08d3ea3b94a27 (diff) | |
| download | kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.tar.gz kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.tar.xz kernel-crypto-193cb93e5a5f32c0520eed17e87135d20594d1e1.zip | |
Merge branch 'master' of /home/gregkh/linux/git/torvalds-2.6
Diffstat (limited to 'drivers/rtc/rtc-pxa.c')
| -rw-r--r-- | drivers/rtc/rtc-pxa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index 747ca194fad..e6351b743da 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c @@ -456,7 +456,7 @@ static int pxa_rtc_resume(struct device *dev) return 0; } -static struct dev_pm_ops pxa_rtc_pm_ops = { +static const struct dev_pm_ops pxa_rtc_pm_ops = { .suspend = pxa_rtc_suspend, .resume = pxa_rtc_resume, }; |