[PATCH] [POWERPC] Fix compile error if CONFIG_STX_GP3 is defined

Kumar Gala galak at kernel.crashing.org
Wed Jan 23 23:38:53 EST 2008


cpmux is need in all cases, having wrapped by the ifndef CONFIG_STX_GP3
was causing a compile error.

---
 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 def0158..d9af06a 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
@@ -165,9 +165,9 @@ void scc2_lineif(struct uart_cpm_port *pinfo)
 	 * really has to get out of the driver so boards can
 	 * be supported in a sane fashion.
 	 */
+	volatile cpmux_t *cpmux = cpm2_map(im_cpmux);
 #ifndef CONFIG_STX_GP3
 	volatile iop_cpm2_t *io = cpm2_map(im_ioport);
-	volatile cpmux_t *cpmux = cpm2_map(im_cpmux);

 	io->iop_pparb |= 0x008b0000;
 	io->iop_pdirb |= 0x00880000;
-- 
1.5.3.7




More information about the Linuxppc-dev mailing list