summaryrefslogtreecommitdiffstats
path: root/include/linux/hyperv.h
diff options
context:
space:
mode:
authorMike Marshall <hubcap@omnibond.com>2017-01-27 13:33:25 -0500
committerMike Marshall <hubcap@omnibond.com>2017-01-27 13:33:25 -0500
commita1f817dc8ed79cdff2b76bc51d545fb9465982be (patch)
tree2c92b9b7cdf3b0efb3b9ce33cd6f84ef4d54a1a7 /include/linux/hyperv.h
parent04102c76a779f1c4cec4f0fb51cacc360117b522 (diff)
parent69973b830859bc6529a7a0468ba0d80ee5117826 (diff)
downloadcachepc-linux-a1f817dc8ed79cdff2b76bc51d545fb9465982be.tar.gz
cachepc-linux-a1f817dc8ed79cdff2b76bc51d545fb9465982be.zip
Merge tag 'v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next
Linux 4.9
Diffstat (limited to 'include/linux/hyperv.h')
-rw-r--r--include/linux/hyperv.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 6824556d37ed..cd184bdca58f 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -1169,13 +1169,6 @@ int __must_check __vmbus_driver_register(struct hv_driver *hv_driver,
const char *mod_name);
void vmbus_driver_unregister(struct hv_driver *hv_driver);
-static inline const char *vmbus_dev_name(const struct hv_device *device_obj)
-{
- const struct kobject *kobj = &device_obj->device.kobj;
-
- return kobj->name;
-}
-
void vmbus_hvsock_device_unregister(struct vmbus_channel *channel);
int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,