Commit bda426f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents b10a8b72 7878ac81

drivers/isdn/hardware/mISDN/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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.

drivers/isdn/hardware/mISDN/hfcpci.c

+1 −2
Original line number Diff line number Diff line
@@ -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;