diff options
| author | Joel Becker <joel.becker@oracle.com> | 2010-04-30 22:37:29 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-04-30 22:37:29 +0200 |
| commit | f9221fd80343285514568da6c5dbda0f87109de8 (patch) | |
| tree | 3a2f0077ebea9d094bdeedb319c97cb591d51c51 /arch/x86/mm/pgtable_32.c | |
| parent | ocfs2_dlmfs: Fix math error when reading LVB. (diff) | |
| parent | ocfs2: Add directory entry later in ocfs2_symlink() and ocfs2_mknod() (diff) | |
| download | linux-f9221fd80343285514568da6c5dbda0f87109de8.tar.xz linux-f9221fd80343285514568da6c5dbda0f87109de8.zip | |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
Diffstat (limited to 'arch/x86/mm/pgtable_32.c')
| -rw-r--r-- | arch/x86/mm/pgtable_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c index 46c8834aedc0..1a8faf09afed 100644 --- a/arch/x86/mm/pgtable_32.c +++ b/arch/x86/mm/pgtable_32.c @@ -6,7 +6,6 @@ #include <linux/swap.h> #include <linux/smp.h> #include <linux/highmem.h> -#include <linux/slab.h> #include <linux/pagemap.h> #include <linux/spinlock.h> #include <linux/module.h> |