diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:34:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-20 12:34:43 -0700 |
| commit | 55017923f699471f68c1469d5f3ff141dd416ab4 (patch) | |
| tree | d0a45ea1da874baf556218a0b33ce9141760bb30 /include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | |
| parent | b4eea67a129423fe423c5d8d26a0aaa9d68ed600 (diff) | |
| parent | f30ac0ce34f32bb998ac87e37b251374de03e603 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue.
Blackfin arch: fix typo error in bf548 serial header file
Diffstat (limited to 'include/asm-blackfin/mach-bf561/bfin_serial_5xx.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h index 30d90b580f1..8aa02780e64 100644 --- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h +++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h @@ -88,7 +88,7 @@ struct bfin_serial_port { # endif #endif #ifdef CONFIG_SERIAL_BFIN_CTSRTS - struct work_struct cts_workqueue; + struct timer_list cts_timer; int cts_pin; int rts_pin; #endif |