diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /drivers/rtc/rtc-ds1305.c | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
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 */ |