diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 (GMT) |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 (GMT) |
commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
tree | 9336a14058eed66c335db10512f33a31f9e8c938 /arch/ppc/platforms/83xx/mpc834x_sys.c | |
parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) | |
download | linux-fsl-qoriq-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.xz |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/ppc/platforms/83xx/mpc834x_sys.c')
-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 012e1e6..1a659bb 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, struct uart_port p; memset(&p, 0, sizeof (p)); - p.iotype = SERIAL_IO_MEM; + p.iotype = UPIO_MEM; p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4500); p.uartclk = binfo->bi_busfreq; gen550_init(0, &p); memset(&p, 0, sizeof (p)); - p.iotype = SERIAL_IO_MEM; + p.iotype = UPIO_MEM; p.membase = (unsigned char __iomem *)(VIRT_IMMRBAR + 0x4600); p.uartclk = binfo->bi_busfreq; |