diff options
| author | Len Brown <len.brown@intel.com> | 2010-09-20 21:44:22 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-09-20 21:44:22 -0400 |
| commit | 697946a687c2818f6b1bbaf976eda9578f02fb4a (patch) | |
| tree | bdbbaecf0d082bc53003f10bda0d54f8bedd7088 /include/acpi | |
| parent | c9b0126b99bf808597ed292b35420c09a07fc322 (diff) | |
| parent | 2422084a94fcd5038406261b331672a13c92c050 (diff) | |
Merge branch 'linus' into test
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index baacd98e7cc6..4de84ce3a927 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -377,9 +377,6 @@ struct acpi_pci_root { u32 osc_support_set; /* _OSC state of support bits */ u32 osc_control_set; /* _OSC state of control bits */ - u32 osc_control_qry; /* the latest _OSC query result */ - - u32 osc_queried:1; /* has _OSC control been queried? */ }; /* helper */ |