diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /drivers/rtc/rtc-ds1305.c | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'drivers/rtc/rtc-ds1305.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1305.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c index 259db7f3535b..9630e7d3314e 100644 --- a/drivers/rtc/rtc-ds1305.c +++ b/drivers/rtc/rtc-ds1305.c | |||
| @@ -778,6 +778,8 @@ static int __devinit ds1305_probe(struct spi_device *spi) | |||
| 778 | spi->irq, status); | 778 | spi->irq, status); |
| 779 | goto fail1; | 779 | goto fail1; |
| 780 | } | 780 | } |
| 781 | |||
| 782 | device_set_wakeup_capable(&spi->dev, 1); | ||
| 781 | } | 783 | } |
| 782 | 784 | ||
| 783 | /* export NVRAM */ | 785 | /* export NVRAM */ |