Commit:     c98750c2eb07b0bf49db0630cb5017ede005ce14
Parent:     9b3a6f4ab98809c93ac57fa5e11dff0575046efc
Author:     Grant Likely <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 2 15:45:37 2007 -0700
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Tue Jan 9 17:03:02 2007 +1100

    [POWERPC] Fix mpc52xx serial driver to work for arch/ppc again
    The mpc52xx_uart_of_enumerate() function was added when adding 52xx
    support to arch/powerpc, but it must not be called for arch/ppc.
    Signed-off-by: Grant Likely <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 drivers/serial/mpc52xx_uart.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 9d11a75..3c4b6c2 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -789,7 +789,9 @@ static struct console mpc52xx_console = {
 static int __init
+#if defined(CONFIG_PPC_MERGE)
        return 0;
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

Reply via email to