diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-01-11 08:02:57 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-01-11 08:02:57 -0500 |
| commit | 98c31c1d6c9c8a7e57cdac96ad574e0e172d3192 (patch) | |
| tree | ab870590bfaf03fb8f9a41b7f61f0b329cd33498 /arch/powerpc/boot | |
| parent | 78994e240fce03832ceebc875c43773a2c615e79 (diff) | |
| parent | f67702a37533f59eee3386578450eeeb531da279 (diff) | |
Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.25
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c index cafeece20ac7..b6c68ef46809 100644 --- a/arch/powerpc/boot/serial.c +++ b/arch/powerpc/boot/serial.c | |||
| @@ -128,7 +128,8 @@ int serial_console_init(void) | |||
| 128 | rc = cpm_console_init(devp, &serial_cd); | 128 | rc = cpm_console_init(devp, &serial_cd); |
| 129 | else if (dt_is_compatible(devp, "mpc5200-psc-uart")) | 129 | else if (dt_is_compatible(devp, "mpc5200-psc-uart")) |
| 130 | rc = mpc5200_psc_console_init(devp, &serial_cd); | 130 | rc = mpc5200_psc_console_init(devp, &serial_cd); |
| 131 | else if (dt_is_compatible(devp, "xilinx,uartlite")) | 131 | else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") || |
| 132 | dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a")) | ||
| 132 | rc = uartlite_console_init(devp, &serial_cd); | 133 | rc = uartlite_console_init(devp, &serial_cd); |
| 133 | 134 | ||
| 134 | /* Add other serial console driver calls here */ | 135 | /* Add other serial console driver calls here */ |