diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:29:02 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:29:02 -0400 |
commit | 37f5d732f34fa099676b2c52b8a57bab01a011de (patch) | |
tree | cca207ab2009e8d5d2097602133d1a20de2b2e5c /include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | |
parent | ed9e4996d9a123b7550e63713d563f524fa9d9f0 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into tracing/sysprof
Diffstat (limited to 'include/asm-blackfin/mach-bf533/bfin_serial_5xx.h')
-rw-r--r-- | include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h index e924569ad1d8..ebf592b59aab 100644 --- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | |||
@@ -88,7 +88,7 @@ struct bfin_serial_port { | |||
88 | # endif | 88 | # endif |
89 | #endif | 89 | #endif |
90 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS | 90 | #ifdef CONFIG_SERIAL_BFIN_CTSRTS |
91 | struct work_struct cts_workqueue; | 91 | struct timer_list cts_timer; |
92 | int cts_pin; | 92 | int cts_pin; |
93 | int rts_pin; | 93 | int rts_pin; |
94 | #endif | 94 | #endif |