diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:29:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:29:28 +0100 |
commit | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 (patch) | |
tree | 12df0f2e25e95654156b2900bd6df1abb3c2e87a /arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h | |
parent | 3a450de1365d20afde406f0d9b2931a5e4a4fd6a (diff) | |
parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff) |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/include/asm/fixmap_64.h
Diffstat (limited to 'arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h')
-rw-r--r-- | arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h index b50a63b975a..e21c1c3e4ec 100644 --- a/arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h @@ -144,7 +144,7 @@ struct bfin_serial_res bfin_serial_resource[] = { CH_UART0_TX, CH_UART0_RX, #endif -#ifdef CONFIG_BFIN_UART0_CTSRTS +#ifdef CONFIG_SERIAL_BFIN_CTSRTS CONFIG_UART0_CTS_PIN, CONFIG_UART0_RTS_PIN, #endif @@ -158,7 +158,7 @@ struct bfin_serial_res bfin_serial_resource[] = { CH_UART1_TX, CH_UART1_RX, #endif -#ifdef CONFIG_BFIN_UART1_CTSRTS +#ifdef CONFIG_SERIAL_BFIN_CTSRTS CONFIG_UART1_CTS_PIN, CONFIG_UART1_RTS_PIN, #endif |