diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-07 23:03:11 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 23:03:11 -0500 |
| commit | d5112a4f31a361409d3c57dc9d58dd69f8014bef (patch) | |
| tree | 64771300b2191cb94d9aaf60355661a01c2ccd1a /drivers/rtc/rtc-sysfs.c | |
| parent | 12e86f92fcfe4f0bcab0ad7fa4088a64c60d9b38 (diff) | |
| parent | 5fad293bcbd48d9a2370020cf60e4b4a42559b12 (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
Diffstat (limited to 'drivers/rtc/rtc-sysfs.c')
| -rw-r--r-- | drivers/rtc/rtc-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c index 9418a59fb368..2ddd0cf07140 100644 --- a/drivers/rtc/rtc-sysfs.c +++ b/drivers/rtc/rtc-sysfs.c | |||
| @@ -78,7 +78,7 @@ static struct attribute_group rtc_attr_group = { | |||
| 78 | .attrs = rtc_attrs, | 78 | .attrs = rtc_attrs, |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | static int __devinit rtc_sysfs_add_device(struct class_device *class_dev, | 81 | static int rtc_sysfs_add_device(struct class_device *class_dev, |
| 82 | struct class_interface *class_intf) | 82 | struct class_interface *class_intf) |
| 83 | { | 83 | { |
| 84 | int err; | 84 | int err; |