diff options
| author | Len Brown <len.brown@intel.com> | 2007-04-28 23:12:03 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-28 23:12:03 -0400 |
| commit | fb16596997ded3e70d308bec58e32c1e2c5cf9b0 (patch) | |
| tree | 28939b49c26e51d2c22047ef2e07f4b1d6352bbb /drivers/acpi/scan.c | |
| parent | f188291aec9b17ef7cec01db66b9cdb6fae26372 (diff) | |
| parent | afd3810d9b6b0d446a34e1d4e94f0cc020b00a14 (diff) | |
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index bb0e0da39fb1..d80dd84e5bfd 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -1068,7 +1068,9 @@ acpi_add_single_object(struct acpi_device **child, | |||
| 1068 | } | 1068 | } |
| 1069 | break; | 1069 | break; |
| 1070 | default: | 1070 | default: |
| 1071 | STRUCT_TO_INT(device->status) = 0x0F; | 1071 | STRUCT_TO_INT(device->status) = |
| 1072 | ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED | | ||
| 1073 | ACPI_STA_DEVICE_UI | ACPI_STA_DEVICE_FUNCTIONING; | ||
| 1072 | break; | 1074 | break; |
| 1073 | } | 1075 | } |
| 1074 | 1076 | ||