diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 10:56:55 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 10:56:55 +0200 |
commit | 1e2697b1ce312f76ecc70051b9298317a4f1f944 (patch) | |
tree | cbc4c2e87ce6270e6b0f7369a1d968cdf088d937 /include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | |
parent | 37aab38972a2dd971f52a01533c0678a0646294b (diff) | |
parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) |
Merge branch 'linus' into kmemchecktip-kmemcheck-2008-06-23_08.59_Mon
Diffstat (limited to 'include/asm-blackfin/mach-bf527/bfin_serial_5xx.h')
-rw-r--r-- | include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h index 96bd09e31e36..2526b6ed6faa 100644 --- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h @@ -96,7 +96,7 @@ struct bfin_serial_port { struct work_struct tx_dma_workqueue; #endif #ifdef CONFIG_SERIAL_BFIN_CTSRTS - struct work_struct cts_workqueue; + struct timer_list cts_timer; int cts_pin; int rts_pin; #endif |