diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /include/asm-x86/mmzone_64.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'include/asm-x86/mmzone_64.h')
| -rw-r--r-- | include/asm-x86/mmzone_64.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mmzone_64.h b/include/asm-x86/mmzone_64.h index 594bd0dc1d08..626b03a14875 100644 --- a/include/asm-x86/mmzone_64.h +++ b/include/asm-x86/mmzone_64.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* K8 NUMA support */ | 1 | /* K8 NUMA support */ |
| 2 | /* Copyright 2002,2003 by Andi Kleen, SuSE Labs */ | 2 | /* Copyright 2002,2003 by Andi Kleen, SuSE Labs */ |
| 3 | /* 2.5 Version loosely based on the NUMAQ Code by Pat Gaughen. */ | 3 | /* 2.5 Version loosely based on the NUMAQ Code by Pat Gaughen. */ |
| 4 | #ifndef _ASM_X86_64_MMZONE_H | 4 | #ifndef ASM_X86__MMZONE_64_H |
| 5 | #define _ASM_X86_64_MMZONE_H 1 | 5 | #define ASM_X86__MMZONE_64_H |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | #ifdef CONFIG_NUMA | 8 | #ifdef CONFIG_NUMA |
| @@ -49,4 +49,4 @@ extern int early_pfn_to_nid(unsigned long pfn); | |||
| 49 | #endif | 49 | #endif |
| 50 | 50 | ||
| 51 | #endif | 51 | #endif |
| 52 | #endif | 52 | #endif /* ASM_X86__MMZONE_64_H */ |