diff options
| author | Linus Torvalds | 2007-10-31 06:23:27 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2007-10-31 06:23:27 +0100 |
| commit | a3634d7169f56eca5e349fce2f1de228fc10efda (patch) | |
| tree | f15da7d958c111cab9e36ede4a7044f52a88f6ff /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| parent | add SubmittingPatches to Documentation/ja_JP (diff) | |
| download | kernel-qcow2-linux-a3634d7169f56eca5e349fce2f1de228fc10efda.tar.gz kernel-qcow2-linux-a3634d7169f56eca5e349fce2f1de228fc10efda.tar.xz kernel-qcow2-linux-a3634d7169f56eca5e349fce2f1de228fc10efda.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
add SubmittingPatches to Documentation/ja_JP
fix typo in SubmittingPatches
Driver Core: fix bug in device_rename() for SYSFS_DEPRECATED=y
sysfs: make sysfs_{get,put}_active() static
kobject: check for duplicate names in kobject_rename
Driver core: remove class_device_*_bin_file
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 2e15822fe409..2c5e49d446b8 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -291,10 +291,6 @@ extern void class_device_put(struct class_device *); extern void class_device_remove_file(struct class_device *, const struct class_device_attribute *); -extern int __must_check class_device_create_bin_file(struct class_device *, - struct bin_attribute *); -extern void class_device_remove_bin_file(struct class_device *, - struct bin_attribute *); struct class_interface { struct list_head node; |