tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds bda426f5 b10a8b72

+1 -3
unified split
-1
drivers/isdn/hardware/mISDN/Kconfig
··· 7 tristate "Support for HFC PCI cards" 8 depends on MISDN 9 depends on PCI 10 - depends on VIRT_TO_BUS 11 help 12 Enable support for cards with Cologne Chip AG's 13 HFC PCI chip.
··· 7 tristate "Support for HFC PCI cards" 8 depends on MISDN 9 depends on PCI 10 help 11 Enable support for cards with Cologne Chip AG's 12 HFC PCI chip.
+1 -2
drivers/isdn/hardware/mISDN/hfcpci.c
··· 1988 printk(KERN_INFO 1989 "HFC-PCI: defined at mem %#lx fifo %#lx(%#lx) IRQ %d HZ %d\n", 1990 (u_long) hc->hw.pci_io, (u_long) hc->hw.fifos, 1991 - (u_long) virt_to_bus(hc->hw.fifos), 1992 - hc->irq, HZ); 1993 /* enable memory mapped ports, disable busmaster */ 1994 pci_write_config_word(hc->pdev, PCI_COMMAND, PCI_ENA_MEMIO); 1995 hc->hw.int_m2 = 0;
··· 1988 printk(KERN_INFO 1989 "HFC-PCI: defined at mem %#lx fifo %#lx(%#lx) IRQ %d HZ %d\n", 1990 (u_long) hc->hw.pci_io, (u_long) hc->hw.fifos, 1991 + (u_long) hc->hw.dmahandle, hc->irq, HZ); 1992 /* enable memory mapped ports, disable busmaster */ 1993 pci_write_config_word(hc->pdev, PCI_COMMAND, PCI_ENA_MEMIO); 1994 hc->hw.int_m2 = 0;