diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2007-04-25 14:17:39 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-25 14:17:39 -0400 |
| commit | a0bd4ac498acfe60f7533d15ba60d5efdd4e9ca5 (patch) | |
| tree | 7b44633901a16fa0a1da34af0a1fa56e62c830d7 /drivers/acpi/container.c | |
| parent | d8938801d10945ac2fbe0f41ded43f6276660a17 (diff) | |
| download | linux-stable-a0bd4ac498acfe60f7533d15ba60d5efdd4e9ca5.tar.gz linux-stable-a0bd4ac498acfe60f7533d15ba60d5efdd4e9ca5.tar.bz2 linux-stable-a0bd4ac498acfe60f7533d15ba60d5efdd4e9ca5.zip | |
ACPI: Remove duplicate definitions for _STA bits
No need to duplicate the existing definitions in include/acpi/actypes.h.
syntax only -- no functional change.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/container.c')
| -rw-r--r-- | drivers/acpi/container.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 0930d9413dfa..0dd3bf7c0ed1 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c @@ -49,8 +49,6 @@ MODULE_AUTHOR("Anil S Keshavamurthy"); MODULE_DESCRIPTION("ACPI container driver"); MODULE_LICENSE("GPL"); -#define ACPI_STA_PRESENT (0x00000001) - static int acpi_container_add(struct acpi_device *device); static int acpi_container_remove(struct acpi_device *device, int type); @@ -75,13 +73,13 @@ static int is_device_present(acpi_handle handle) status = acpi_get_handle(handle, "_STA", &temp); if (ACPI_FAILURE(status)) - return 1; /* _STA not found, assmue device present */ + return 1; /* _STA not found, assume device present */ status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); if (ACPI_FAILURE(status)) return 0; /* Firmware error */ - return ((sta & ACPI_STA_PRESENT) == ACPI_STA_PRESENT); + return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT); } /*******************************************************************/ |