summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpi_bus.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-09-21 13:35:29 -0600
committerLen Brown <len.brown@intel.com>2009-09-25 15:09:48 -0400
commit1131b938f0757350f569f8ad5bee737cd02b8e58 (patch)
tree679f4ff97f6858f18af7c86807644dc8144512f0 /include/acpi/acpi_bus.h
parentb2972f87508a21db7584d11fdb5c97cb7101a788 (diff)
downloadlinux-stable-1131b938f0757350f569f8ad5bee737cd02b8e58.tar.gz
linux-stable-1131b938f0757350f569f8ad5bee737cd02b8e58.tar.bz2
linux-stable-1131b938f0757350f569f8ad5bee737cd02b8e58.zip
ACPI: remove acpi_device.flags.hardware_id
Every acpi_device has at least one ID (if there's no _HID or _CID, we give it a synthetic or default ID). So there's no longer a need to check whether an ID exists; we can just use it. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r--include/acpi/acpi_bus.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 0a970e4ade6f..6599b8cab45a 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -141,7 +141,6 @@ struct acpi_device_status {
struct acpi_device_flags {
u32 dynamic_status:1;
- u32 hardware_id:1;
u32 bus_address:1;
u32 unique_id:1;
u32 removable:1;
@@ -152,7 +151,7 @@ struct acpi_device_flags {
u32 performance_manageable:1;
u32 wake_capable:1; /* Wakeup(_PRW) supported? */
u32 force_power_state:1;
- u32 reserved:20;
+ u32 reserved:21;
};
/* File System */