diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 07:33:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 07:33:41 -0500 |
| commit | a3ec4a603faf4244e275bf11b467aad092dfbd8a (patch) | |
| tree | 1c15009716b37629070ea221a00eb9fe2303a317 /drivers/rtc/class.c | |
| parent | 51563cd53c4b1c1790fccd2e0af0e2b756589af9 (diff) | |
| parent | 85e2efbb1db9a18d218006706d6e4fbeb0216213 (diff) | |
Merge commit 'v2.6.38-rc5' into core/locking
Merge reason: pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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; |