summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorBjorn Helgaas2009-09-21 21:35:24 +0200
committerLen Brown2009-09-25 21:09:47 +0200
commitb2972f87508a21db7584d11fdb5c97cb7101a788 (patch)
tree7a8b80e20c910461bdf50590c9493ec1ba095f1e /include/acpi
parentACPI: maintain a single list of _HID and _CID IDs (diff)
downloadkernel-qcow2-linux-b2972f87508a21db7584d11fdb5c97cb7101a788.tar.gz
kernel-qcow2-linux-b2972f87508a21db7584d11fdb5c97cb7101a788.tar.xz
kernel-qcow2-linux-b2972f87508a21db7584d11fdb5c97cb7101a788.zip
ACPI: remove acpi_device.flags.compatible_ids
We now keep a single list of IDs that includes both the _HID and any _CIDs. We no longer need to keep track of whether the device has a _CID. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-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 c2c434626edc..0a970e4ade6f 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -142,7 +142,6 @@ struct acpi_device_status {
struct acpi_device_flags {
u32 dynamic_status:1;
u32 hardware_id:1;
- u32 compatible_ids:1;
u32 bus_address:1;
u32 unique_id:1;
u32 removable:1;
@@ -153,7 +152,7 @@ struct acpi_device_flags {
u32 performance_manageable:1;
u32 wake_capable:1; /* Wakeup(_PRW) supported? */
u32 force_power_state:1;
- u32 reserved:19;
+ u32 reserved:20;
};
/* File System */