diff options
author | Michal Marek <mmarek@suse.cz> | 2011-03-09 16:15:44 +0100 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-03-09 16:15:44 +0100 |
commit | 2d8ad8719591fa803b0d589ed057fa46f49b7155 (patch) | |
tree | 4ae051577dad1161c91dafbf4207bb10a9dc91bb /fs/binfmt_em86.c | |
parent | deb-pkg: Fix building outside of source tree (O=...). (diff) | |
parent | Linux 2.6.38-rc1 (diff) | |
download | linux-2d8ad8719591fa803b0d589ed057fa46f49b7155.tar.xz linux-2d8ad8719591fa803b0d589ed057fa46f49b7155.zip |
Merge commit 'v2.6.38-rc1' into kbuild/packaging
Diffstat (limited to 'fs/binfmt_em86.c')
-rw-r--r-- | fs/binfmt_em86.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c index 32fb00b52cd0..b8e8b0acf9bd 100644 --- a/fs/binfmt_em86.c +++ b/fs/binfmt_em86.c @@ -11,7 +11,6 @@ #include <linux/module.h> #include <linux/string.h> #include <linux/stat.h> -#include <linux/slab.h> #include <linux/binfmts.h> #include <linux/elf.h> #include <linux/init.h> |