diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
| commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
| tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /drivers/rtc/class.c | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'drivers/rtc/class.c')
| -rw-r--r-- | drivers/rtc/class.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 9583cbcc6b79..c404b61386bf 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
| @@ -143,6 +143,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, | |||
| 143 | rtc->id = id; | 143 | rtc->id = id; |
| 144 | rtc->ops = ops; | 144 | rtc->ops = ops; |
| 145 | rtc->owner = owner; | 145 | rtc->owner = owner; |
| 146 | rtc->irq_freq = 1; | ||
| 146 | rtc->max_user_freq = 64; | 147 | rtc->max_user_freq = 64; |
| 147 | rtc->dev.parent = dev; | 148 | rtc->dev.parent = dev; |
| 148 | rtc->dev.class = rtc_class; | 149 | rtc->dev.class = rtc_class; |