diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-23 07:36:40 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-23 20:35:20 -0500 |
commit | 1dd4561e7d9b907afd10709f9ff092861e8ab095 (patch) | |
tree | 228f186ac360fc989351bc1dcc12729e0aa07777 /drivers/serial | |
parent | de3c8d41828553fa4cbba0399826e20a02670663 (diff) |
[POWERPC] Fix compile error if CONFIG_STX_GP3 is defined
cpmux is need in all cases, having wrapped by the ifndef CONFIG_STX_GP3
was causing a compile error.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | 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 def01582de5c..d9af06a791ba 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) | |||
165 | * really has to get out of the driver so boards can | 165 | * really has to get out of the driver so boards can |
166 | * be supported in a sane fashion. | 166 | * be supported in a sane fashion. |
167 | */ | 167 | */ |
168 | volatile cpmux_t *cpmux = cpm2_map(im_cpmux); | ||
168 | #ifndef CONFIG_STX_GP3 | 169 | #ifndef CONFIG_STX_GP3 |
169 | volatile iop_cpm2_t *io = cpm2_map(im_ioport); | 170 | volatile iop_cpm2_t *io = cpm2_map(im_ioport); |
170 | volatile cpmux_t *cpmux = cpm2_map(im_cpmux); | ||
171 | 171 | ||
172 | io->iop_pparb |= 0x008b0000; | 172 | io->iop_pparb |= 0x008b0000; |
173 | io->iop_pdirb |= 0x00880000; | 173 | io->iop_pdirb |= 0x00880000; |