diff options
| author |  Ingo Molnar <mingo@elte.hu>
| 2009-08-11 14:19:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu>
| 2009-08-11 14:19:09 +0200 |
| commit | 89034bc2c7b839702c00a704e79d112737f98be0 (patch) | |
| tree | e65b1f3d4c751baa840efc81bc4734f089379eb3 /arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h | |
| parent | tracing/filters: Don't use pred on alloc failure (diff) | |
| parent | pty: fix data loss when stopped (^S/^Q) (diff) | |
| download | linux-89034bc2c7b839702c00a704e79d112737f98be0.tar.gz linux-89034bc2c7b839702c00a704e79d112737f98be0.tar.bz2 linux-89034bc2c7b839702c00a704e79d112737f98be0.zip | |
Merge branch 'linus' into tracing/core
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h')
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h index a3789d7ccf8c..4062e24e759b 100644 --- a/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h @@ -53,7 +53,7 @@ #define UART_SET_DLAB(uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) | DLAB); SSYNC(); } while (0) #define UART_CLEAR_DLAB(uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) & ~DLAB); SSYNC(); } while (0) -#define UART_GET_CTS(x) (!gpio_get_value(x->cts_pin)) +#define UART_GET_CTS(x) gpio_get_value(x->cts_pin) #define UART_DISABLE_RTS(x) gpio_set_value(x->rts_pin, 1) #define UART_ENABLE_RTS(x) gpio_set_value(x->rts_pin, 0) #define UART_ENABLE_INTS(x, v) UART_PUT_IER(x, v) |