git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ixp4xx
/
ixp4xx_npe.c
diff --git
a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
index e8bb257781661da9424208d8f79862cc088e377f..a17ed79207a4fce30f67b405f758cd07b23f85ad 100644
(file)
--- a/
arch/arm/mach-ixp4xx/ixp4xx_npe.c
+++ b/
arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@
-20,7
+20,6
@@
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/slab.h>
#include <mach/npe.h>
#define DEBUG_MSG 0