aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>2007-02-02 11:48:19 -0500
committerLen Brown <len.brown@intel.com>2007-02-02 21:14:22 -0500
commitad71860a17ba33eb0e673e9e2cf5ba0d8e3e3fdd (patch)
tree9f60547a2e8782c04d7cd1c41bc874047008458c /drivers/acpi/scan.c
parenta4bbb810dedaecf74d54b16b6dd3c33e95e1024c (diff)
ACPICA: minimal patch to integrate new tables into Linux
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 283d87522c5d..b1692b18c9d7 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1333,7 +1333,7 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
1333 /* 1333 /*
1334 * Enumerate all fixed-feature devices. 1334 * Enumerate all fixed-feature devices.
1335 */ 1335 */
1336 if (acpi_fadt.pwr_button == 0) { 1336 if ((acpi_fadt.flags & ACPI_FADT_POWER_BUTTON) == 0) {
1337 result = acpi_add_single_object(&device, acpi_root, 1337 result = acpi_add_single_object(&device, acpi_root,
1338 NULL, 1338 NULL,
1339 ACPI_BUS_TYPE_POWER_BUTTON); 1339 ACPI_BUS_TYPE_POWER_BUTTON);
@@ -1341,7 +1341,7 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
1341 result = acpi_start_single_object(device); 1341 result = acpi_start_single_object(device);
1342 } 1342 }
1343 1343
1344 if (acpi_fadt.sleep_button == 0) { 1344 if ((acpi_fadt.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {
1345 result = acpi_add_single_object(&device, acpi_root, 1345 result = acpi_add_single_object(&device, acpi_root,
1346 NULL, 1346 NULL,
1347 ACPI_BUS_TYPE_SLEEP_BUTTON); 1347 ACPI_BUS_TYPE_SLEEP_BUTTON);