projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de3c8d4
)
[POWERPC] Fix compile error if CONFIG_STX_GP3 is defined
author
Kumar Gala
<galak@kernel.crashing.org>
Wed, 23 Jan 2008 12:36:40 +0000
(06:36 -0600)
committer
Kumar Gala
<galak@kernel.crashing.org>
Thu, 24 Jan 2008 01:35:20 +0000
(19:35 -0600)
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>
drivers/serial/cpm_uart/cpm_uart_cpm2.c
patch
|
blob
|
history
diff --git
a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
b/drivers/serial/cpm_uart/cpm_uart_cpm2.c
index def01582de5ccd6c121f6906ebd262de5a66c5df..d9af06a791ba51b77bbb9af8bb93d35299fc9d7d 100644
(file)
--- 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;