diff options
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index c4ed4c2389c7..7ced5dc20dd3 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -144,12 +144,11 @@ struct acpi_device_flags { | |||
| 144 | u32 bus_address:1; | 144 | u32 bus_address:1; |
| 145 | u32 removable:1; | 145 | u32 removable:1; |
| 146 | u32 ejectable:1; | 146 | u32 ejectable:1; |
| 147 | u32 lockable:1; | ||
| 148 | u32 suprise_removal_ok:1; | 147 | u32 suprise_removal_ok:1; |
| 149 | u32 power_manageable:1; | 148 | u32 power_manageable:1; |
| 150 | u32 performance_manageable:1; | 149 | u32 performance_manageable:1; |
| 151 | u32 eject_pending:1; | 150 | u32 eject_pending:1; |
| 152 | u32 reserved:23; | 151 | u32 reserved:24; |
| 153 | }; | 152 | }; |
| 154 | 153 | ||
| 155 | /* File System */ | 154 | /* File System */ |
| @@ -180,6 +179,7 @@ struct acpi_device_pnp { | |||
| 180 | acpi_device_name device_name; /* Driver-determined */ | 179 | acpi_device_name device_name; /* Driver-determined */ |
| 181 | acpi_device_class device_class; /* " */ | 180 | acpi_device_class device_class; /* " */ |
| 182 | union acpi_object *str_obj; /* unicode string for _STR method */ | 181 | union acpi_object *str_obj; /* unicode string for _STR method */ |
| 182 | unsigned long sun; /* _SUN */ | ||
| 183 | }; | 183 | }; |
| 184 | 184 | ||
| 185 | #define acpi_device_bid(d) ((d)->pnp.bus_id) | 185 | #define acpi_device_bid(d) ((d)->pnp.bus_id) |
