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 'devel-stable' into devel
[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
..
f108a31
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>
@@
-177,7
+176,7
@@
static struct plat_serial8250_port n2100_serial_port[] = {
.mapbase = N2100_UART,
.membase = (char *)N2100_UART,
.irq = 0,
.mapbase = N2100_UART,
.membase = (char *)N2100_UART,
.irq = 0,
- .flags = UPF_SKIP_TEST,
+ .flags = UPF_SKIP_TEST
| UPF_AUTO_IRQ | UPF_SHARE_IRQ
,
.iotype = UPIO_MEM,
.regshift = 0,
.uartclk = 1843200,
.iotype = UPIO_MEM,
.regshift = 0,
.uartclk = 1843200,