diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
| commit | 1e74f9cbbba5348a6c58988cce0f19d6ef887cc8 (patch) | |
| tree | 47fcfdba6a17a02cf6745146ebb2ae435405ab1a /include/asm-blackfin/mach-bf537 | |
| parent | 31a72bce0bd6f3e0114009288bccbc96376eeeca (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into core/rcutip-core-rcu-2008-06-23_09.29_Mon
Diffstat (limited to 'include/asm-blackfin/mach-bf537')
| -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 |