diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-24 02:09:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 02:09:26 -0400 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /drivers/rtc | |
| parent | 1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 58b7336640ff..d397fa5f3a91 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c | |||
| @@ -345,7 +345,7 @@ struct rtc_device *rtc_class_open(char *name) | |||
| 345 | struct device *dev; | 345 | struct device *dev; |
| 346 | struct rtc_device *rtc = NULL; | 346 | struct rtc_device *rtc = NULL; |
| 347 | 347 | ||
| 348 | dev = class_find_device(rtc_class, name, __rtc_match); | 348 | dev = class_find_device(rtc_class, NULL, name, __rtc_match); |
| 349 | if (dev) | 349 | if (dev) |
| 350 | rtc = to_rtc_device(dev); | 350 | rtc = to_rtc_device(dev); |
| 351 | 351 | ||