diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:41:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:41:56 -0700 |
| commit | bda426f5310ffddcd463fe20f352609e84989514 (patch) | |
| tree | 8eed1fbe72b0c9ca6293980664e55275b761c3fa | |
| parent | b10a8b7238d7b034f28d32a85bb05c48475f132a (diff) | |
| parent | 7878ac81e69c5b3ccad59808da06edf16455a57a (diff) | |
| download | linux-3.10-bda426f5310ffddcd463fe20f352609e84989514.tar.gz linux-3.10-bda426f5310ffddcd463fe20f352609e84989514.tar.bz2 linux-3.10-bda426f5310ffddcd463fe20f352609e84989514.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Remove deprecated virt_to_bus()
| -rw-r--r-- | drivers/isdn/hardware/mISDN/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/isdn/hardware/mISDN/hfcpci.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig index 9cd5f5f6228..14793480c45 100644 --- a/drivers/isdn/hardware/mISDN/Kconfig +++ b/drivers/isdn/hardware/mISDN/Kconfig @@ -7,7 +7,6 @@ config MISDN_HFCPCI tristate "Support for HFC PCI cards" depends on MISDN depends on PCI - depends on VIRT_TO_BUS help Enable support for cards with Cologne Chip AG's HFC PCI chip. diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index 917968530e1..3231814e7ef 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c @@ -1988,8 +1988,7 @@ setup_hw(struct hfc_pci *hc) printk(KERN_INFO "HFC-PCI: defined at mem %#lx fifo %#lx(%#lx) IRQ %d HZ %d\n", (u_long) hc->hw.pci_io, (u_long) hc->hw.fifos, - (u_long) virt_to_bus(hc->hw.fifos), - hc->irq, HZ); + (u_long) hc->hw.dmahandle, hc->irq, HZ); /* enable memory mapped ports, disable busmaster */ pci_write_config_word(hc->pdev, PCI_COMMAND, PCI_ENA_MEMIO); hc->hw.int_m2 = 0; |