diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /drivers/base/topology.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/base/topology.c')
| -rw-r--r-- | drivers/base/topology.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/topology.c b/drivers/base/topology.c index 3ef9d514b916..28dccb730af9 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c | |||
| @@ -97,8 +97,7 @@ static struct attribute_group topology_attr_group = { | |||
| 97 | /* Add/Remove cpu_topology interface for CPU device */ | 97 | /* Add/Remove cpu_topology interface for CPU device */ |
| 98 | static int __cpuinit topology_add_dev(struct sys_device * sys_dev) | 98 | static int __cpuinit topology_add_dev(struct sys_device * sys_dev) |
| 99 | { | 99 | { |
| 100 | sysfs_create_group(&sys_dev->kobj, &topology_attr_group); | 100 | return sysfs_create_group(&sys_dev->kobj, &topology_attr_group); |
| 101 | return 0; | ||
| 102 | } | 101 | } |
| 103 | 102 | ||
| 104 | static int __cpuinit topology_remove_dev(struct sys_device * sys_dev) | 103 | static int __cpuinit topology_remove_dev(struct sys_device * sys_dev) |