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()

2 files changed, 1 insertions, 3 deletions

diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig
index 9cd5f5f62280..14793480c453 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 917968530e1e..3231814e7efa 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;