diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 10:15:32 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-01 10:15:32 +1100 |
| commit | fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3 (patch) | |
| tree | 050a81468f8644cfb0f3c07a140456c136301a30 /include/linux | |
| parent | e95035c61a4c3dae1aa543a5bf5b39846daca061 (diff) | |
| parent | 62152d0ea7012382cd814c7b361b4ef2029f26e6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
asm-generic/tlb.h: build fix
x86: uninline __pte_free_tlb() and __pmd_free_tlb()
x86: fix small sparse warning
x86: fix sparse warning in kernel/scx200_32.c
x86: early_ioremap_reset fix 2
x86: c_p_a clflush_cache_range fix
x86: change_page_attr_clear fix
x86: fix sparse warnings in intel_cacheinfo.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/swap.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index 2c3ce4c69b25..4f3838adbb30 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -6,7 +6,6 @@ #include <linux/mmzone.h> #include <linux/list.h> #include <linux/sched.h> -#include <linux/pagemap.h> #include <asm/atomic.h> #include <asm/page.h> |