diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 14:31:12 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 14:31:12 -0200 |
| commit | fc21a2dd371806aed818e2ec0dfcb55dc7448a98 (patch) | |
| tree | 9107857e4a46feae6b09a400cbb127f72c7e35af /arch/blackfin/include/asm/bfin_serial.h | |
| parent | bc5b8a9003132ae44559edd63a1623b7b99dfb68 (diff) | |
| parent | 905905432868fa513f0f783fb9e5724536f4ee1f (diff) | |
| download | talos-op-linux-fc21a2dd371806aed818e2ec0dfcb55dc7448a98.tar.gz talos-op-linux-fc21a2dd371806aed818e2ec0dfcb55dc7448a98.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
blackfin: Fixup export.h includes
Blackfin: add serial TX IRQ in individual platform resource
Diffstat (limited to 'arch/blackfin/include/asm/bfin_serial.h')
| -rw-r--r-- | arch/blackfin/include/asm/bfin_serial.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/bfin_serial.h b/arch/blackfin/include/asm/bfin_serial.h index 7fd0ec7b5b0f..ecacdf34768b 100644 --- a/arch/blackfin/include/asm/bfin_serial.h +++ b/arch/blackfin/include/asm/bfin_serial.h @@ -32,6 +32,8 @@ struct work_struct; struct bfin_serial_port { struct uart_port port; unsigned int old_status; + int tx_irq; + int rx_irq; int status_irq; #ifndef BFIN_UART_BF54X_STYLE unsigned int lsr; |
