]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Remove deprecated virt_to_bus()
authorKarsten Keil <kkeil@suse.de>
Mon, 28 Jul 2008 10:21:25 +0000 (12:21 +0200)
committerKarsten Keil <kkeil@suse.de>
Mon, 28 Jul 2008 10:21:25 +0000 (12:21 +0200)
Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6.git master

This was a forgotten item in a printk from the old driver,
the DMA allocation use already the new interface.

Signed-off-by: Karsten Keil <kkeil@suse.de>
drivers/isdn/hardware/mISDN/Kconfig
drivers/isdn/hardware/mISDN/hfcpci.c

index 9cd5f5f62280042f870f606a8e2da8d43fe2c8cc..14793480c453e0e915a4188dc697af6e9e5b416e 100644 (file)
@@ -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.
index 917968530e1e93dfcb71c96148b43647e15c2502..3231814e7efa0ef5fd335fc51420e9e756acc48e 100644 (file)
@@ -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;