summaryrefslogtreecommitdiff
path: root/drivers/base/base.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-22 13:00:15 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-07-22 13:00:15 +0300
commit1af824f085e813e06548212b18bbc788b16f60e6 (patch)
tree7e4bea76e0780330e27d660633ba514dc02e2fbf /drivers/base/base.h
parentd8bcf4db9244e2b85597c680f4e1c3a837b067fe (diff)
parent072a7852338af900c302490474939e089f4bd4c4 (diff)
downloadlinux-1af824f085e813e06548212b18bbc788b16f60e6.tar.xz
Merge branch 'bind_unbind' into driver-core-next
This merges the bind_unbind driver core feature into the driver-core-next branch. bind_unbind is a branch so that others can pull and work off of it safely. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/base.h')
-rw-r--r--drivers/base/base.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h
index e19b1008e5fb..539432a14b5c 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -126,11 +126,6 @@ extern int driver_add_groups(struct device_driver *drv,
extern void driver_remove_groups(struct device_driver *drv,
const struct attribute_group **groups);
-extern int device_add_groups(struct device *dev,
- const struct attribute_group **groups);
-extern void device_remove_groups(struct device *dev,
- const struct attribute_group **groups);
-
extern char *make_class_name(const char *name, struct kobject *kobj);
extern int devres_release_all(struct device *dev);