Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0f9ec0a828565c4d2dcb01ce6af824c001396357
Commit:     0f9ec0a828565c4d2dcb01ce6af824c001396357
Parent:     c91ef5986185c044a853d990670e3f7ce22f2991
Author:     Paul Gortmaker <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 15 12:43:06 2007 -0500
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Fri Feb 16 14:00:19 2007 +1100

    [POWERPC] Fix compile failure in cpm_uart_cpm2
    
    Fix bug that exists in kernel.org since 2.6.17rc4 - compiles fail if
    CONFIG_SERIAL_CPM_SMC is defined.  Tested on a board using SMC1 console.
    
    Signed-off-by: Paul Gortmaker <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 drivers/serial/cpm_uart/cpm_uart_cpm2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c 
b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index 787a8f1..fa45599 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -285,7 +285,7 @@ void cpm_uart_freebuf(struct uart_cpm_port *pinfo)
 int __init cpm_uart_init_portdesc(void)
 {
 #if defined(CONFIG_SERIAL_CPM_SMC1) || defined(CONFIG_SERIAL_CPM_SMC2)
-       u32 addr;
+       u16 *addr;
 #endif
        pr_debug("CPM uart[-]:init portdesc\n");
 
-
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

Reply via email to