diff options
| author | James Morris <jmorris@namei.org> | 2010-05-06 04:56:07 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 04:56:07 +0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /arch/mips/sibyte/common/sb_tbprof.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
| download | linux-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'arch/mips/sibyte/common/sb_tbprof.c')
| -rw-r--r-- | arch/mips/sibyte/common/sb_tbprof.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c index ed2453eab5cb..d4ed7a9156f5 100644 --- a/arch/mips/sibyte/common/sb_tbprof.c +++ b/arch/mips/sibyte/common/sb_tbprof.c @@ -27,7 +27,6 @@ #include <linux/types.h> #include <linux/init.h> #include <linux/interrupt.h> -#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/fs.h> #include <linux/errno.h> |