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 mainline (v2.6.34-rc7)
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
neponset.c
diff --git
a/arch/arm/mach-sa1100/neponset.c
b/arch/arm/mach-sa1100/neponset.c
index 0b505d9f22d6e7fcc9c568d0dc2a0977fe25f0a6..c601a75a333d147bf138cba667e11b84b9871a14 100644
(file)
--- a/
arch/arm/mach-sa1100/neponset.c
+++ b/
arch/arm/mach-sa1100/neponset.c
@@
-8,7
+8,6
@@
#include <linux/ioport.h>
#include <linux/serial_core.h>
#include <linux/platform_device.h>
-#include <linux/slab.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>