diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2010-04-09 16:17:41 +0200 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-04-09 16:21:12 +0200 |
commit | 87d8a69709d971913e6cc7210450fcb8be963667 (patch) | |
tree | 4f8eb95c588f7df84554dcf97d67540664333a7b /drivers/rtc/rtc-ds1374.c | |
parent | intel-iommu: Fix section mismatch dmar_ir_support() uses dmar_tbl. (diff) | |
parent | Linux 2.6.34-rc3 (diff) | |
download | linux-87d8a69709d971913e6cc7210450fcb8be963667.tar.xz linux-87d8a69709d971913e6cc7210450fcb8be963667.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/rtc/rtc-ds1374.c')
-rw-r--r-- | drivers/rtc/rtc-ds1374.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 713f7bf5afb3..5317bbcbc7a0 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c @@ -383,6 +383,8 @@ static int ds1374_probe(struct i2c_client *client, dev_err(&client->dev, "unable to request IRQ\n"); goto out_free; } + + device_set_wakeup_capable(&client->dev, 1); } ds1374->rtc = rtc_device_register(client->name, &client->dev, |