Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / acnamesp.h

diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 952fbe0b7231a79c62f463bd36e8bce596c8c478..0dd088290d80588fa1e4f7545c70d712e8b7c86c 100644 (file)
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -66,6 +66,7 @@
 #define ACPI_NS_PREFIX_IS_SCOPE     0x10
 #define ACPI_NS_EXTERNAL            0x20
 #define ACPI_NS_TEMPORARY           0x40
+#define ACPI_NS_OVERRIDE_IF_FOUND   0x80
 
 /* Flags for acpi_ns_walk_namespace */