diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:28:13 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:28:13 -0500 |
| commit | 99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed (patch) | |
| tree | 6f977546112ccbd617ef40ae38a1ca558d71bce9 /arch/ppc/platforms/83xx | |
| parent | 332b5a52f2f96bc2d13bbe594a430318c0ee4425 (diff) | |
| parent | 8a19ac89edbe9b702c10fd2039b8cb2db4644a5f (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/ppc/platforms/83xx')
| -rw-r--r-- | arch/ppc/platforms/83xx/mpc834x_sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c index 012e1e652c03..1a659bbc1860 100644 --- a/arch/ppc/platforms/83xx/mpc834x_sys.c +++ b/arch/ppc/platforms/83xx/mpc834x_sys.c | |||
| @@ -301,14 +301,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | |||
| 301 | struct uart_port p; | 301 | struct uart_port p; |
| 302 | 302 | ||
| 303 | memset(&p, 0, sizeof (p)); | 303 | memset(&p, 0, sizeof (p)); |
| 304 | p.iotype = SERIAL_IO_MEM; | 304 | p.iotype = UPIO_MEM; |
| 305 | p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4500); | 305 | p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4500); |
| 306 | p.uartclk = binfo->bi_busfreq; | 306 | p.uartclk = binfo->bi_busfreq; |
| 307 | 307 | ||
| 308 | gen550_init(0, &p); | 308 | gen550_init(0, &p); |
| 309 | 309 | ||
| 310 | memset(&p, 0, sizeof (p)); | 310 | memset(&p, 0, sizeof (p)); |
| 311 | p.iotype = SERIAL_IO_MEM; | 311 | p.iotype = UPIO_MEM; |
| 312 | p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4600); | 312 | p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4600); |
| 313 | p.uartclk = binfo->bi_busfreq; | 313 | p.uartclk = binfo->bi_busfreq; |
| 314 | 314 | ||