diff options
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index c13c919ab99e..cf0817a555e4 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -63,13 +63,6 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld | |||
63 | #define ACPI_BUS_FILE_ROOT "acpi" | 63 | #define ACPI_BUS_FILE_ROOT "acpi" |
64 | extern struct proc_dir_entry *acpi_root_dir; | 64 | extern struct proc_dir_entry *acpi_root_dir; |
65 | 65 | ||
66 | enum acpi_bus_removal_type { | ||
67 | ACPI_BUS_REMOVAL_NORMAL = 0, | ||
68 | ACPI_BUS_REMOVAL_EJECT, | ||
69 | ACPI_BUS_REMOVAL_SUPRISE, | ||
70 | ACPI_BUS_REMOVAL_TYPE_COUNT | ||
71 | }; | ||
72 | |||
73 | enum acpi_bus_device_type { | 66 | enum acpi_bus_device_type { |
74 | ACPI_BUS_TYPE_DEVICE = 0, | 67 | ACPI_BUS_TYPE_DEVICE = 0, |
75 | ACPI_BUS_TYPE_POWER, | 68 | ACPI_BUS_TYPE_POWER, |
@@ -286,6 +279,7 @@ struct acpi_device_physical_node { | |||
286 | u8 node_id; | 279 | u8 node_id; |
287 | struct list_head node; | 280 | struct list_head node; |
288 | struct device *dev; | 281 | struct device *dev; |
282 | bool put_online:1; | ||
289 | }; | 283 | }; |
290 | 284 | ||
291 | /* set maximum of physical nodes to 32 for expansibility */ | 285 | /* set maximum of physical nodes to 32 for expansibility */ |
@@ -310,7 +304,6 @@ struct acpi_device { | |||
310 | struct acpi_driver *driver; | 304 | struct acpi_driver *driver; |
311 | void *driver_data; | 305 | void *driver_data; |
312 | struct device dev; | 306 | struct device dev; |
313 | enum acpi_bus_removal_type removal_type; /* indicate for different removal type */ | ||
314 | u8 physical_node_count; | 307 | u8 physical_node_count; |
315 | struct list_head physical_node_list; | 308 | struct list_head physical_node_list; |
316 | struct mutex physical_node_lock; | 309 | struct mutex physical_node_lock; |