diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-18 13:34:30 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-18 13:34:30 +1000 |
| commit | 11a55f2274bf0d719e4dd05f4ac5e89a15740211 (patch) | |
| tree | 0886a988b43e280fe00e529155f8cd796e7edcc8 /arch/powerpc/boot/mpc52xx-psc.c | |
| parent | 858c52d15f186e055dc33a1872f5b45a66d42296 (diff) | |
| parent | 1a9ebc0cd2b3bb4450834e564722630fbc40611b (diff) | |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/powerpc/boot/mpc52xx-psc.c')
| -rw-r--r-- | arch/powerpc/boot/mpc52xx-psc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/boot/mpc52xx-psc.c b/arch/powerpc/boot/mpc52xx-psc.c index 1074626e6a3..d4cb4e4e093 100644 --- a/arch/powerpc/boot/mpc52xx-psc.c +++ b/arch/powerpc/boot/mpc52xx-psc.c @@ -51,14 +51,9 @@ static unsigned char psc_getc(void) int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp) { - int n; - /* Get the base address of the psc registers */ - n = getprop(devp, "virtual-reg", &psc, sizeof(psc)); - if (n != sizeof(psc)) { - if (!dt_xlate_reg(devp, 0, (void *)&psc, NULL)) - return -1; - } + if (dt_get_virtual_reg(devp, &psc, 1) < 1) + return -1; scdp->open = psc_open; scdp->putc = psc_putc; |