projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
page_types.h
diff --git
a/arch/x86/include/asm/page_types.h
b/arch/x86/include/asm/page_types.h
index
3d43ce3
..
95e11f7
100644
(file)
--- a/
arch/x86/include/asm/page_types.h
+++ b/
arch/x86/include/asm/page_types.h
@@
-3,7
+3,6
@@
#include <linux/const.h>
#include <linux/types.h>
-#include <asm/bootparam.h>
/* PAGE_SHIFT determines the page size */
#define PAGE_SHIFT 12