diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /drivers/serial/8250_au1x00.c | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/serial/8250_au1x00.c')
| -rw-r--r-- | drivers/serial/8250_au1x00.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c index 3d1bfd07208d..58015fd14be9 100644 --- a/drivers/serial/8250_au1x00.c +++ b/drivers/serial/8250_au1x00.c | |||
| @@ -30,13 +30,12 @@ | |||
| 30 | { \ | 30 | { \ |
| 31 | .iobase = _base, \ | 31 | .iobase = _base, \ |
| 32 | .membase = (void __iomem *)_base,\ | 32 | .membase = (void __iomem *)_base,\ |
| 33 | .mapbase = _base, \ | 33 | .mapbase = CPHYSADDR(_base), \ |
| 34 | .irq = _irq, \ | 34 | .irq = _irq, \ |
| 35 | .uartclk = 0, /* filled */ \ | 35 | .uartclk = 0, /* filled */ \ |
| 36 | .regshift = 2, \ | 36 | .regshift = 2, \ |
| 37 | .iotype = UPIO_AU, \ | 37 | .iotype = UPIO_AU, \ |
| 38 | .flags = UPF_SKIP_TEST | \ | 38 | .flags = UPF_SKIP_TEST \ |
| 39 | UPF_IOREMAP, \ | ||
| 40 | } | 39 | } |
| 41 | 40 | ||
| 42 | static struct plat_serial8250_port au1x00_data[] = { | 41 | static struct plat_serial8250_port au1x00_data[] = { |