git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sh/driver-core'
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop32x
/
n2100.c
diff --git
a/arch/arm/mach-iop32x/n2100.c
b/arch/arm/mach-iop32x/n2100.c
index
2a5c637
..
5d99039
100644
(file)
--- a/
arch/arm/mach-iop32x/n2100.c
+++ b/
arch/arm/mach-iop32x/n2100.c
@@
-23,7
+23,6
@@
#include <linux/pci.h>
#include <linux/pm.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <linux/pm.h>
#include <linux/string.h>
-#include <linux/slab.h>
#include <linux/serial_core.h>
#include <linux/serial_8250.h>
#include <linux/mtd/physmap.h>
#include <linux/serial_core.h>
#include <linux/serial_8250.h>
#include <linux/mtd/physmap.h>