diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-generic/memory_model.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-generic/memory_model.h')
| -rw-r--r-- | include/asm-generic/memory_model.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index 52226e14bd7d..ae060c62aff1 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #ifndef __ASM_MEMORY_MODEL_H | 1 | #ifndef __ASM_MEMORY_MODEL_H |
| 2 | #define __ASM_MEMORY_MODEL_H | 2 | #define __ASM_MEMORY_MODEL_H |
| 3 | 3 | ||
| 4 | #ifdef __KERNEL__ | ||
| 5 | #ifndef __ASSEMBLY__ | 4 | #ifndef __ASSEMBLY__ |
| 6 | 5 | ||
| 7 | #if defined(CONFIG_FLATMEM) | 6 | #if defined(CONFIG_FLATMEM) |
| @@ -81,6 +80,5 @@ extern unsigned long page_to_pfn(struct page *page); | |||
| 81 | #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */ | 80 | #endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */ |
| 82 | 81 | ||
| 83 | #endif /* __ASSEMBLY__ */ | 82 | #endif /* __ASSEMBLY__ */ |
| 84 | #endif /* __KERNEL__ */ | ||
| 85 | 83 | ||
| 86 | #endif | 84 | #endif |