diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-02-25 23:55:17 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-02-25 23:55:17 -0800 |
| commit | 3a540b9db12b9bf2105d1df86019a7719df402e7 (patch) | |
| tree | 26d962e6db7c2289db29c846acb6841a85f21118 /drivers/base | |
| parent | ff4dc41e80523dc9e488e99f41985bd2f7b4620c (diff) | |
| parent | d7176726d92897e464066302a9815a6e21dd5dc4 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/driver-2.6
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/cpu.c | 2 | ||||
| -rw-r--r-- | drivers/base/node.c | 2 | ||||
| -rw-r--r-- | drivers/base/sys.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 6937604432c5..cf92d77467a8 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -29,7 +29,7 @@ int __init register_cpu(struct cpu *cpu, int num, struct node *root) cpu->sysdev.id = num; cpu->sysdev.cls = &cpu_sysdev_class; - error = sys_device_register(&cpu->sysdev); + error = sysdev_register(&cpu->sysdev); if (!error && root) error = sysfs_create_link(&root->sysdev.kobj, &cpu->sysdev.kobj, diff --git a/drivers/base/node.c b/drivers/base/node.c index e161a1c21dbf..a35701c4a039 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -69,7 +69,7 @@ int __init register_node(struct node *node, int num, struct node *parent) node->cpumap = node_to_cpumask(num); node->sysdev.id = num; node->sysdev.cls = &node_class; - error = sys_device_register(&node->sysdev); + error = sysdev_register(&node->sysdev); if (!error){ sysdev_create_file(&node->sysdev, &attr_cpumap); diff --git a/drivers/base/sys.c b/drivers/base/sys.c index 5aa23916135b..e85cbb0527f2 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c @@ -8,7 +8,7 @@ * * This exports a 'system' bus type. * By default, a 'sys' bus gets added to the root of the system. There will - * always be core system devices. Devices can use sys_device_register() to + * always be core system devices. Devices can use sysdev_register() to * add themselves as children of the system bus. */ @@ -164,11 +164,11 @@ EXPORT_SYMBOL(sysdev_driver_unregister); /** - * sys_device_register - add a system device to the tree + * sysdev_register - add a system device to the tree * @sysdev: device in question * */ -int sys_device_register(struct sys_device * sysdev) +int sysdev_register(struct sys_device * sysdev) { int error; struct sysdev_class * cls = sysdev->cls; @@ -212,7 +212,7 @@ int sys_device_register(struct sys_device * sysdev) return error; } -void sys_device_unregister(struct sys_device * sysdev) +void sysdev_unregister(struct sys_device * sysdev) { struct sysdev_driver * drv; @@ -390,5 +390,5 @@ int __init sys_bus_init(void) return subsystem_register(&system_subsys); } -EXPORT_SYMBOL(sys_device_register); -EXPORT_SYMBOL(sys_device_unregister); +EXPORT_SYMBOL(sysdev_register); +EXPORT_SYMBOL(sysdev_unregister); |