diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 00:51:29 -0500 |
commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /arch/ppc/platforms/85xx/tqm85xx.c | |
parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) |
Merge ../powerpc-merge
Diffstat (limited to 'arch/ppc/platforms/85xx/tqm85xx.c')
-rw-r--r-- | arch/ppc/platforms/85xx/tqm85xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/85xx/tqm85xx.c b/arch/ppc/platforms/85xx/tqm85xx.c index b436f4d0a3fa..a5e38ba62732 100644 --- a/arch/ppc/platforms/85xx/tqm85xx.c +++ b/arch/ppc/platforms/85xx/tqm85xx.c | |||
@@ -346,14 +346,14 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | |||
346 | binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0); | 346 | binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0); |
347 | 347 | ||
348 | memset(&p, 0, sizeof (p)); | 348 | memset(&p, 0, sizeof (p)); |
349 | p.iotype = SERIAL_IO_MEM; | 349 | p.iotype = UPIO_MEM; |
350 | p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET; | 350 | p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART0_OFFSET; |
351 | p.uartclk = binfo->bi_busfreq; | 351 | p.uartclk = binfo->bi_busfreq; |
352 | 352 | ||
353 | gen550_init(0, &p); | 353 | gen550_init(0, &p); |
354 | 354 | ||
355 | memset(&p, 0, sizeof (p)); | 355 | memset(&p, 0, sizeof (p)); |
356 | p.iotype = SERIAL_IO_MEM; | 356 | p.iotype = UPIO_MEM; |
357 | p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET; | 357 | p.membase = (void *) binfo->bi_immr_base + MPC85xx_UART1_OFFSET; |
358 | p.uartclk = binfo->bi_busfreq; | 358 | p.uartclk = binfo->bi_busfreq; |
359 | 359 | ||