diff options
| author | David S. Miller <davem@davemloft.net> | 2011-09-22 03:23:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-22 03:23:13 -0400 |
| commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
| tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /drivers/tty/serial/pch_uart.c | |
| parent | 3fc72370186be2f9d4d6ef06d99e1caa5d92c564 (diff) | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'drivers/tty/serial/pch_uart.c')
| -rw-r--r-- | drivers/tty/serial/pch_uart.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 846dfcd3ce0..b46218d679e 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c | |||
| @@ -598,7 +598,8 @@ static void pch_request_dma(struct uart_port *port) | |||
| 598 | dma_cap_zero(mask); | 598 | dma_cap_zero(mask); |
| 599 | dma_cap_set(DMA_SLAVE, mask); | 599 | dma_cap_set(DMA_SLAVE, mask); |
| 600 | 600 | ||
| 601 | dma_dev = pci_get_bus_and_slot(2, PCI_DEVFN(0xa, 0)); /* Get DMA's dev | 601 | dma_dev = pci_get_bus_and_slot(priv->pdev->bus->number, |
| 602 | PCI_DEVFN(0xa, 0)); /* Get DMA's dev | ||
| 602 | information */ | 603 | information */ |
| 603 | /* Set Tx DMA */ | 604 | /* Set Tx DMA */ |
| 604 | param = &priv->param_tx; | 605 | param = &priv->param_tx; |