diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-03 15:33:17 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-03 15:33:17 +1000 |
| commit | 70f227d8846a8a9b1f36f71c42e11cc7c6e9408d (patch) | |
| tree | fb4dd5c8240bdaada819fb569c01a392b52847b9 /drivers/serial | |
| parent | a0c7ce9c877ceef8428798ac91fb794f83609aed (diff) | |
| parent | f778089cb2445dfc6dfd30a7a567925fd8589f1e (diff) | |
| download | op-kernel-dev-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.zip op-kernel-dev-70f227d8846a8a9b1f36f71c42e11cc7c6e9408d.tar.gz | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm1.h | 2 | ||||
| -rw-r--r-- | drivers/serial/sunsab.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h index a99e45e..2a64778 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) up->smc_tfcr = SMC_EB; } -#define DPRAM_BASE ((unsigned char *)&cpmp->cp_dpmem[0]) +#define DPRAM_BASE ((unsigned char *)cpm_dpram_addr(0)) #endif diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index e348ba6..ff610c2 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c @@ -38,7 +38,7 @@ #include <asm/prom.h> #include <asm/of_device.h> -#if defined(CONFIG_SERIAL_SUNZILOG_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) +#if defined(CONFIG_SERIAL_SUNSAB_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #define SUPPORT_SYSRQ #endif |
