diff options
author | Paul Mackerras <paulus@samba.org> | 2007-02-07 04:05:13 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 04:05:13 +0100 |
commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /drivers/rtc/rtc-sysfs.c | |
parent | [POWERPC] Make pSeries use the H_BULK_REMOVE hypervisor call (diff) | |
parent | Linux 2.6.20 (diff) | |
download | linux-8423200553113cc031caa9b147f6150a8e26545c.tar.xz linux-8423200553113cc031caa9b147f6150a8e26545c.zip |
Merge branch 'linux-2.6'
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 = { .attrs = rtc_attrs, }; -static int __devinit rtc_sysfs_add_device(struct class_device *class_dev, +static int rtc_sysfs_add_device(struct class_device *class_dev, struct class_interface *class_intf) { int err; |