git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
mips
/
mm
/
hugetlbpage.c
diff --git
a/arch/mips/mm/hugetlbpage.c
b/arch/mips/mm/hugetlbpage.c
index
471c09a
..
8c2834f
100644
(file)
--- a/
arch/mips/mm/hugetlbpage.c
+++ b/
arch/mips/mm/hugetlbpage.c
@@
-16,7
+16,6
@@
#include <linux/mm.h>
#include <linux/hugetlb.h>
#include <linux/pagemap.h>
-#include <linux/smp_lock.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/sysctl.h>