diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_bus.h | 3 | ||||
| -rw-r--r-- | include/linux/device.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 22650cd9e72a..02e113bb8b7d 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -167,9 +167,8 @@ struct acpi_device_flags { | |||
| 167 | u32 removable:1; | 167 | u32 removable:1; |
| 168 | u32 ejectable:1; | 168 | u32 ejectable:1; |
| 169 | u32 power_manageable:1; | 169 | u32 power_manageable:1; |
| 170 | u32 eject_pending:1; | ||
| 171 | u32 match_driver:1; | 170 | u32 match_driver:1; |
| 172 | u32 reserved:26; | 171 | u32 reserved:27; |
| 173 | }; | 172 | }; |
| 174 | 173 | ||
| 175 | /* File System */ | 174 | /* File System */ |
diff --git a/include/linux/device.h b/include/linux/device.h index 22b546a58591..545a04285120 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -895,6 +895,7 @@ static inline bool device_supports_offline(struct device *dev) | |||
| 895 | 895 | ||
| 896 | extern void lock_device_hotplug(void); | 896 | extern void lock_device_hotplug(void); |
| 897 | extern void unlock_device_hotplug(void); | 897 | extern void unlock_device_hotplug(void); |
| 898 | extern int lock_device_hotplug_sysfs(void); | ||
| 898 | extern int device_offline(struct device *dev); | 899 | extern int device_offline(struct device *dev); |
| 899 | extern int device_online(struct device *dev); | 900 | extern int device_online(struct device *dev); |
| 900 | /* | 901 | /* |
