diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 23:55:59 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 23:55:59 +0200 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /include/asm-i386 | |
| parent | Rename libata-bmdma.c to libata-sff.c. (diff) | |
| parent | Linux v2.6.18-rc5 (diff) | |
| download | linux-b01e86fee6c821e4e003fd4e9f65453ac478a58e.tar.xz linux-b01e86fee6c821e4e003fd4e9f65453ac478a58e.zip | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'include/asm-i386')
| -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[]; #ifdef CONFIG_X86_NUMAQ #include <asm/numaq.h> -#else /* summit or generic arch */ +#elif defined(CONFIG_ACPI_SRAT)/* summit or generic arch */ #include <asm/srat.h> #endif |