Skip to contentSkip to conversation

Fix compile failure in cpm_uart_cpm2

PATCH In review Paul Gortmaker 2 participants 3 messages Feb 15, 2007 – Feb 16, 2007

lore
Share & tools
lore

Paul Gortmaker

author
#0 lore raw

PATCH 1/1 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]>

---

drivers/serial/cpm_uart/cpm_uart_cpm2.c renamed from drivers/serial/cpm_uart/cpm_uart_cpm2.c~ +1 -1
@@ -285,7 +285,7 @@
 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");
#1 lore raw
Quoted 4 lines · On Thu, 15 Feb 2007 12:43:06 -0500 Paul Gortmaker wrote:

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.

This has been submitted already by Heiko Schocher <[email protected]>, sorry... Anyway, got to be fixed soon.

Quoted 19 lines
Signed-off-by Paul Gortmaker <[email protected]>

---

--- linux-2.6.20/drivers/serial/cpm_uart/cpm_uart_cpm2.c~

2007-02-07 14:07:47.778573326 -0500 +++
linux-2.6.20/drivers/serial/cpm_uart/cpm_uart_cpm2.c
2007-02-07 14:07:58.248391885 -0500 @@ -285,7 +285,7 @@ int __init

cpm_uart_init_portdesc(void) {
#if defined(CONFIG_SERIAL_CPM_SMC1) ||
defined(CONFIG_SERIAL_CPM_SMC2)

drivers/serial/cpm_uart/cpm_uart_cpm2.c renamed from drivers/serial/cpm_uart/cpm_uart_cpm2.c~ +1 -1
-	u32 addr;
+	u16 *addr;
 #endif
 	pr_debug("CPM uart[-]:init portdesc\n");

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev

author
#2 lore raw

In message: Re: [PATCH] Fix compile failure in cpm_uart_cpm2

Quoted 10 lines · on 15/02/2007 Vitaly Bordug wrote:
Quoted 4 lines · On Thu, 15 Feb 2007 12:43:06 -0500 Paul Gortmaker wrote:

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.

This has been submitted already by Heiko Schocher <[email protected]>, sorry... Anyway, got to be fixed soon.

Hi Vitaly,

Thanks for the reference; I'd not seen Heiko's patch. I see it is in git already this morning as well.

Paul.