diff options
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_bus.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 6599b8cab45a..3cd9ccdcbd8f 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -142,7 +142,6 @@ struct acpi_device_status { | |||
142 | struct acpi_device_flags { | 142 | struct acpi_device_flags { |
143 | u32 dynamic_status:1; | 143 | u32 dynamic_status:1; |
144 | u32 bus_address:1; | 144 | u32 bus_address:1; |
145 | u32 unique_id:1; | ||
146 | u32 removable:1; | 145 | u32 removable:1; |
147 | u32 ejectable:1; | 146 | u32 ejectable:1; |
148 | u32 lockable:1; | 147 | u32 lockable:1; |
@@ -151,7 +150,7 @@ struct acpi_device_flags { | |||
151 | u32 performance_manageable:1; | 150 | u32 performance_manageable:1; |
152 | u32 wake_capable:1; /* Wakeup(_PRW) supported? */ | 151 | u32 wake_capable:1; /* Wakeup(_PRW) supported? */ |
153 | u32 force_power_state:1; | 152 | u32 force_power_state:1; |
154 | u32 reserved:21; | 153 | u32 reserved:22; |
155 | }; | 154 | }; |
156 | 155 | ||
157 | /* File System */ | 156 | /* File System */ |
@@ -186,7 +185,6 @@ struct acpi_device_pnp { | |||
186 | #define acpi_device_bid(d) ((d)->pnp.bus_id) | 185 | #define acpi_device_bid(d) ((d)->pnp.bus_id) |
187 | #define acpi_device_adr(d) ((d)->pnp.bus_address) | 186 | #define acpi_device_adr(d) ((d)->pnp.bus_address) |
188 | char *acpi_device_hid(struct acpi_device *device); | 187 | char *acpi_device_hid(struct acpi_device *device); |
189 | #define acpi_device_uid(d) ((d)->pnp.unique_id) | ||
190 | #define acpi_device_name(d) ((d)->pnp.device_name) | 188 | #define acpi_device_name(d) ((d)->pnp.device_name) |
191 | #define acpi_device_class(d) ((d)->pnp.device_class) | 189 | #define acpi_device_class(d) ((d)->pnp.device_class) |
192 | 190 | ||