diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 23:27:13 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 23:27:13 +0200 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /include/acpi/acnames.h | |
| parent | [IA64] Increase max physical address for SN platforms (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| download | linux-344a076110f4ecb16ea6d286b63be696604982ed.tar.xz linux-344a076110f4ecb16ea6d286b63be696604982ed.zip | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/acpi/acnames.h')
| -rw-r--r-- | include/acpi/acnames.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h index deb7cb06f5f0..4f9063f3e951 100644 --- a/include/acpi/acnames.h +++ b/include/acpi/acnames.h @@ -71,14 +71,13 @@ /* Definitions of the predefined namespace names */ -#define ACPI_UNKNOWN_NAME (u32) 0x3F3F3F3F /* Unknown name is "????" */ -#define ACPI_ROOT_NAME (u32) 0x5F5F5F5C /* Root name is "\___" */ -#define ACPI_SYS_BUS_NAME (u32) 0x5F53425F /* Sys bus name is "_SB_" */ +#define ACPI_UNKNOWN_NAME (u32) 0x3F3F3F3F /* Unknown name is "????" */ +#define ACPI_ROOT_NAME (u32) 0x5F5F5F5C /* Root name is "\___" */ + +#define ACPI_PREFIX_MIXED (u32) 0x69706341 /* "Acpi" */ +#define ACPI_PREFIX_LOWER (u32) 0x69706361 /* "acpi" */ #define ACPI_NS_ROOT_PATH "\\" #define ACPI_NS_SYSTEM_BUS "_SB_" - -#endif /* __ACNAMES_H__ */ - - +#endif /* __ACNAMES_H__ */ |