Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c35a8fb2f2467c93fe402b1d4b1e124341d0da13 Commit: c35a8fb2f2467c93fe402b1d4b1e124341d0da13 Parent: ab99eee8ac902a0e176231447f318a0ed68f45d8 Author: Stephen Neuendorffer <[EMAIL PROTECTED]> AuthorDate: Wed Jan 9 06:35:08 2008 +1100 Committer: Grant Likely <[EMAIL PROTECTED]> CommitDate: Wed Jan 9 07:56:31 2008 -0700
[POWERPC] Xilinx: updated device tree compatibility to match uboot bsp generator. Missed this one in the boot loader before. Signed-off-by: Stephen Neuendorffer <[EMAIL PROTECTED]> Signed-off-by: Grant Likely <[EMAIL PROTECTED]> --- 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 cafeece..b6c68ef 100644 --- a/arch/powerpc/boot/serial.c +++ b/arch/powerpc/boot/serial.c @@ -128,7 +128,8 @@ int serial_console_init(void) rc = cpm_console_init(devp, &serial_cd); else if (dt_is_compatible(devp, "mpc5200-psc-uart")) rc = mpc5200_psc_console_init(devp, &serial_cd); - else if (dt_is_compatible(devp, "xilinx,uartlite")) + else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") || + dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a")) rc = uartlite_console_init(devp, &serial_cd); /* Add other serial console driver calls here */ - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html