diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-03-02 03:06:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-03-02 03:06:24 -0800 |
| commit | 0752b74581e91388000c15d6d2c64bd5a3373041 (patch) | |
| tree | ff24a243ef28894c21160aa1d384a8042f0a4f1b /include | |
| parent | 961c380cef0f1af06c254488d1a672324ec2b34a (diff) | |
| parent | 78c7e8f04fc63a9faf73070647dbb619dee9b5bd (diff) | |
Merge gregkh@kernel.bkbits.net:linux/driver-2.6
into kroah.com:/home/linux/BK/driver-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sysdev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h index 2a90db8d41de..635db1df656f 100644 --- a/include/linux/sysdev.h +++ b/include/linux/sysdev.h @@ -70,8 +70,8 @@ struct sys_device { struct kobject kobj; }; -extern int sys_device_register(struct sys_device *); -extern void sys_device_unregister(struct sys_device *); +extern int sysdev_register(struct sys_device *); +extern void sysdev_unregister(struct sys_device *); struct sysdev_attribute { |