diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /include/asm-i386/mmzone.h | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
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 e33e9f9e4c66..22cb07cc8f32 100644 --- a/include/asm-i386/mmzone.h +++ b/include/asm-i386/mmzone.h | |||
| @@ -14,7 +14,7 @@ extern struct pglist_data *node_data[]; | |||
| 14 | 14 | ||
| 15 | #ifdef CONFIG_X86_NUMAQ | 15 | #ifdef CONFIG_X86_NUMAQ |
| 16 | #include <asm/numaq.h> | 16 | #include <asm/numaq.h> |
| 17 | #else /* summit or generic arch */ | 17 | #elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */ |
| 18 | #include <asm/srat.h> | 18 | #include <asm/srat.h> |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||