diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-28 18:14:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-28 18:14:55 (GMT) |
| commit | 04b905942b482092a547798a2477f21e32a8f65d (patch) | |
| tree | 9ad2837587f5ce284f830432fec3569ecf44fbcb /include | |
| parent | d90ce8711ceb516de823ae878270e5a21d11dede (diff) | |
| parent | 3bc46b312b1486b1fe2db4246a34a30160d26d8d (diff) | |
| download | linux-04b905942b482092a547798a2477f21e32a8f65d.tar.xz | |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
serial: bcm63xx_uart: fix irq storm after rx fifo overrun.
amba pl011: platform data for reg lockup and glitch v2
amba pl011: workaround for uart registers lockup
tty: n_gsm: improper skb_pull() use was leaking framed data
tty: n_gsm: Fixed logic to decode break signal from modem status
TTY: ntty, add one more sanity check
TTY: ldisc, do not close until there are readers
8250: Fix capabilities when changing the port type
8250_pci: Fix missing const from merges
ARM: SAMSUNG: serial: Fix on handling of one clock source for UART
serial: ioremap warning fix for jsm driver.
8250_pci: add -ENODEV code for Intel EG20T PCH
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/serial.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index 5479fdc..514ed45 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h @@ -201,6 +201,9 @@ struct amba_pl011_data { bool (*dma_filter)(struct dma_chan *chan, void *filter_param); void *dma_rx_param; void *dma_tx_param; + void (*init) (void); + void (*exit) (void); + void (*reset) (void); }; #endif |