projects
/
cascardo
/
linux.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://git390.osdl.marist.edu/pub/scm/linux-2.6
[cascardo/linux.git]
/
drivers
/
serial
/
8250_au1x00.c
diff --git
a/drivers/serial/8250_au1x00.c
b/drivers/serial/8250_au1x00.c
index
3d1bfd0
..
58015fd
100644
(file)
--- a/
drivers/serial/8250_au1x00.c
+++ b/
drivers/serial/8250_au1x00.c
@@
-30,13
+30,12
@@
{ \
.iobase = _base, \
.membase = (void __iomem *)_base,\
{ \
.iobase = _base, \
.membase = (void __iomem *)_base,\
- .mapbase =
_base,
\
+ .mapbase =
CPHYSADDR(_base),
\
.irq = _irq, \
.uartclk = 0, /* filled */ \
.regshift = 2, \
.iotype = UPIO_AU, \
.irq = _irq, \
.uartclk = 0, /* filled */ \
.regshift = 2, \
.iotype = UPIO_AU, \
- .flags = UPF_SKIP_TEST | \
- UPF_IOREMAP, \
+ .flags = UPF_SKIP_TEST \
}
static struct plat_serial8250_port au1x00_data[] = {
}
static struct plat_serial8250_port au1x00_data[] = {