diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-03-23 12:05:13 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-03-23 12:05:13 +1000 |
| commit | 65d1086c44791112188f6aebbdc3a27cab3736d3 (patch) | |
| tree | f769c133e61c54e34e91aa9ecf1d3504a6eb4fb4 /include/linux/device.h | |
| parent | edd849e5448c4f6ddc04a5fa1ac5479176660c27 (diff) | |
| parent | 97da3854c526d3a6ee05c849c96e48d21527606c (diff) | |
BackMerge tag 'v4.11-rc3' into drm-next
Linux 4.11-rc3 as requested by Daniel
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 30c4570e928d..9ef518af5515 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1140,7 +1140,6 @@ static inline bool device_supports_offline(struct device *dev) extern void lock_device_hotplug(void); extern void unlock_device_hotplug(void); extern int lock_device_hotplug_sysfs(void); -void assert_held_device_hotplug(void); extern int device_offline(struct device *dev); extern int device_online(struct device *dev); extern void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode); |