diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 18:33:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 18:33:03 -0400 |
| commit | bd8936632475665bfd90c1180c9c1301ee838db8 (patch) | |
| tree | aa4b396932957d72300dadb080566df5ce4d14c1 /drivers | |
| parent | f100353ff5bfd83be00ae55e98b4d611d2eb5681 (diff) | |
| parent | f93c7c5aab8d5efaf99c88c8452d9303baabc89b (diff) | |
Merge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
* 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] mpc8349emitx.dts: Setup USB-DR for peripheral mode.
[POWERPC] Fix mpc834x USB-MPH configuration.
[POWERPC] Fix cpm_uart driver for cpm1 machines
[PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem
[POWERPC] Fix copy'n'paste typo in commproc.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm1.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h index a99e45e2b6d8..2a6477834c3e 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h | |||
| @@ -37,6 +37,6 @@ static inline void cpm_set_smc_fcr(volatile smc_uart_t * up) | |||
| 37 | up->smc_tfcr = SMC_EB; | 37 | up->smc_tfcr = SMC_EB; |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | #define DPRAM_BASE ((unsigned char *)&cpmp->cp_dpmem[0]) | 40 | #define DPRAM_BASE ((unsigned char *)cpm_dpram_addr(0)) |
| 41 | 41 | ||
| 42 | #endif | 42 | #endif |