diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-05 03:12:21 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-05 03:12:21 -0400 |
| commit | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (patch) | |
| tree | c0229c107045ab21487729f6a6cab6b70ed30bfa /drivers/rtc/rtc-sh.c | |
| parent | f8852b12200df393b0a4db1a7052454bbc335443 (diff) | |
| parent | 00b317a41c5428b13eb7e5b4bbc691b1aa7afa80 (diff) | |
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'drivers/rtc/rtc-sh.c')
| -rw-r--r-- | drivers/rtc/rtc-sh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index e55dc1ac83ab..6ac55fd48413 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
| @@ -782,11 +782,11 @@ static void sh_rtc_set_irq_wake(struct device *dev, int enabled) | |||
| 782 | struct platform_device *pdev = to_platform_device(dev); | 782 | struct platform_device *pdev = to_platform_device(dev); |
| 783 | struct sh_rtc *rtc = platform_get_drvdata(pdev); | 783 | struct sh_rtc *rtc = platform_get_drvdata(pdev); |
| 784 | 784 | ||
| 785 | set_irq_wake(rtc->periodic_irq, enabled); | 785 | irq_set_irq_wake(rtc->periodic_irq, enabled); |
| 786 | 786 | ||
| 787 | if (rtc->carry_irq > 0) { | 787 | if (rtc->carry_irq > 0) { |
| 788 | set_irq_wake(rtc->carry_irq, enabled); | 788 | irq_set_irq_wake(rtc->carry_irq, enabled); |
| 789 | set_irq_wake(rtc->alarm_irq, enabled); | 789 | irq_set_irq_wake(rtc->alarm_irq, enabled); |
| 790 | } | 790 | } |
| 791 | } | 791 | } |
| 792 | 792 | ||