summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-03-12 22:36:51 +0400
committerTejun Heo <tj@kernel.org>2013-03-12 22:36:51 +0400
commit36b519dfc7b57b8f91940a6e346d9a248e501e0d (patch)
treef06690f367ba8257946ce79a728027c1bce1d797 /include/linux
parentba630e4940924ad1962883c207a62890778ced63 (diff)
parentd73ce004225a7b2ed75f4340bb63721d55552265 (diff)
downloadlinux-36b519dfc7b57b8f91940a6e346d9a248e501e0d.tar.xz
Merge branch 'for-3.10-subsys_virtual_register' into for-3.10
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/device.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 9d6464ea99c6..ee10d4e7be1a 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -302,6 +302,8 @@ void subsys_interface_unregister(struct subsys_interface *sif);
int subsys_system_register(struct bus_type *subsys,
const struct attribute_group **groups);
+int subsys_virtual_register(struct bus_type *subsys,
+ const struct attribute_group **groups);
/**
* struct class - device classes