diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 11:29:52 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 11:29:52 +0300 |
| commit | 354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 (patch) | |
| tree | 59b597e44902d8db8bde7deac1e7e707327c6fe6 /arch/tile/mm/hugetlbpage.c | |
| parent | 5144c534d16529bc469396211131e8935589f833 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
| download | linux-354d14b3f53cc749c5d26d4ba7280d1e931d6bc4.tar.xz | |
Merge branch 'topic/workq-update' into topic/misc
Diffstat (limited to 'arch/tile/mm/hugetlbpage.c')
| -rw-r--r-- | arch/tile/mm/hugetlbpage.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c index 24688b697a8d..201a582c4137 100644 --- a/arch/tile/mm/hugetlbpage.c +++ b/arch/tile/mm/hugetlbpage.c @@ -21,7 +21,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> |