git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
serial
/
cpm_uart
/
cpm_uart_cpm2.h
diff --git
a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
index
4793fec
..
4b77911
100644
(file)
--- a/
drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/
drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@
-1,5
+1,5
@@
/*
/*
- * linux/drivers/serial/cpm_uart_cpm2.h
+ * linux/drivers/serial/cpm_uart
/cpm_uart
_cpm2.h
*
* Driver for CPM (SCC/SMC) serial ports
*
*
* Driver for CPM (SCC/SMC) serial ports
*
@@
-40,6
+40,6
@@
static inline void cpm_set_smc_fcr(volatile smc_uart_t * up)
up->smc_tfcr = CPMFCR_GBL | CPMFCR_EB;
}
up->smc_tfcr = CPMFCR_GBL | CPMFCR_EB;
}
-#define DPRAM_BASE ((unsigned char *)
&cpm2_immr->im_dprambase[0]
)
+#define DPRAM_BASE ((unsigned char *)
cpm_dpram_addr(0)
)
#endif
#endif