diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-06 21:04:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-06 21:04:54 +0200 |
| commit | d6606683a5e3dac35cb979c7195f54ed827567bd (patch) | |
| tree | 05abf88c9de4b1c99de2c8f955d6c04c2e8abc6a /mm | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| download | linux-d6606683a5e3dac35cb979c7195f54ed827567bd.tar.xz linux-d6606683a5e3dac35cb979c7195f54ed827567bd.zip | |
Revert duplicate "mm/hugetlb.c must #include <asm/io.h>"
This reverts commit 7cb93181629c613ee2b8f4ffe3446f8003074842, since we
did that patch twice, and the problem was already fixed earlier by
78a34ae29bf1c9df62a5bd0f0798b6c62a54d520.
Reported-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 28a2980ee435..757ca983fd99 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -17,7 +17,7 @@ #include <linux/mutex.h> #include <linux/bootmem.h> #include <linux/sysfs.h> -#include <asm/io.h> + #include <asm/page.h> #include <asm/pgtable.h> #include <asm/io.h> |