diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/media/dvb/mantis/mantis_uart.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_uart.c')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/mantis/mantis_uart.c b/drivers/media/dvb/mantis/mantis_uart.c index 97b889e8a34..f807c8ba26e 100644 --- a/drivers/media/dvb/mantis/mantis_uart.c +++ b/drivers/media/dvb/mantis/mantis_uart.c | |||
| @@ -172,7 +172,7 @@ int mantis_uart_init(struct mantis_pci *mantis) | |||
| 172 | mmwrite(mmread(MANTIS_UART_CTL) | MANTIS_UART_RXINT, MANTIS_UART_CTL); | 172 | mmwrite(mmread(MANTIS_UART_CTL) | MANTIS_UART_RXINT, MANTIS_UART_CTL); |
| 173 | 173 | ||
| 174 | schedule_work(&mantis->uart_work); | 174 | schedule_work(&mantis->uart_work); |
| 175 | dprintk(MANTIS_DEBUG, 1, "UART succesfully initialized"); | 175 | dprintk(MANTIS_DEBUG, 1, "UART successfully initialized"); |
| 176 | 176 | ||
| 177 | return 0; | 177 | return 0; |
| 178 | } | 178 | } |