diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 11:41:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 11:41:30 -0800 |
| commit | a7538a7f87826fb5cacc6959f00dfa9fba6f4b15 (patch) | |
| tree | a0fef9252200a78634f0fa4eaa714c7a40e802b9 /include/linux/device.h | |
| parent | 92320cec611d4ed44a9bd635727d61f6caa669a7 (diff) | |
| parent | dfff0a0671baf4e69fc676bf8150635407548288 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Revert "Driver core: let request_module() send a /sys/modules/kmod/-uevent"
Driver core: fix error by cleanup up symlinks properly
make kernel/kmod.c:kmod_mk static
power management: fix struct layout and docs
power management: no valid states w/o pm_ops
Driver core: more fallout from class_device changes for pcmcia
sysfs: move struct sysfs_dirent to private header
driver core: refcounting fix
Driver core: remove class_device_rename
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index d1a3a27c398..39a3199a826 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -294,8 +294,6 @@ extern void class_device_initialize(struct class_device *); extern int __must_check class_device_add(struct class_device *); extern void class_device_del(struct class_device *); -extern int class_device_rename(struct class_device *, char *); - extern struct class_device * class_device_get(struct class_device *); extern void class_device_put(struct class_device *); |