diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:31:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:31:28 +0200 |
| commit | 8700600a74852d75eb965b969dcf9f58e2b32546 (patch) | |
| tree | 1490919076921ecc208bf667a8c2f8a7c5446854 /include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | |
| parent | b8e0418b2a25f975c3b8764030c24b7253d33a68 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/nmitip-x86-nmi-2008-06-25_10.31_Wed
Diffstat (limited to 'include/asm-blackfin/mach-bf537/bfin_serial_5xx.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h index 41d7b6490bb1..1bf56ffa22f9 100644 --- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf537/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 |