diff options
author | Greg KH <gregkh@suse.de> | 2005-09-12 12:10:59 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 12:10:59 -0700 |
commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /include/asm-i386/mmzone.h | |
parent | [PATCH] I2C: i2c-nforce2: drop unused define (diff) | |
parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
download | linux-dev-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.tar.xz linux-dev-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.zip |
Merge ../torvalds-2.6/
Diffstat (limited to 'include/asm-i386/mmzone.h')
-rw-r--r-- | include/asm-i386/mmzone.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h index 516421300ea2..348fe3a4879d 100644 --- a/include/asm-i386/mmzone.h +++ b/include/asm-i386/mmzone.h @@ -29,7 +29,7 @@ static inline void get_memcfg_numa(void) #ifdef CONFIG_X86_NUMAQ if (get_memcfg_numaq()) return; -#elif CONFIG_ACPI_SRAT +#elif defined(CONFIG_ACPI_SRAT) if (get_memcfg_from_srat()) return; #endif |