diff options
author | Karsten Keil <kkeil@suse.de> | 2008-07-28 06:21:25 -0400 |
---|---|---|
committer | Karsten Keil <kkeil@suse.de> | 2008-07-28 06:21:25 -0400 |
commit | 7878ac81e69c5b3ccad59808da06edf16455a57a (patch) | |
tree | c7eefaed20ef54c99772e91564b51225398ae355 | |
parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) |
Remove deprecated virt_to_bus()
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>
-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 9cd5f5f62280..14793480c453 100644 --- a/drivers/isdn/hardware/mISDN/Kconfig +++ b/drivers/isdn/hardware/mISDN/Kconfig | |||
@@ -7,7 +7,6 @@ config MISDN_HFCPCI | |||
7 | tristate "Support for HFC PCI cards" | 7 | tristate "Support for HFC PCI cards" |
8 | depends on MISDN | 8 | depends on MISDN |
9 | depends on PCI | 9 | depends on PCI |
10 | depends on VIRT_TO_BUS | ||
11 | help | 10 | help |
12 | Enable support for cards with Cologne Chip AG's | 11 | Enable support for cards with Cologne Chip AG's |
13 | HFC PCI chip. | 12 | 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) | |||
1988 | printk(KERN_INFO | 1988 | printk(KERN_INFO |
1989 | "HFC-PCI: defined at mem %#lx fifo %#lx(%#lx) IRQ %d HZ %d\n", | 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, | 1990 | (u_long) hc->hw.pci_io, (u_long) hc->hw.fifos, |
1991 | (u_long) virt_to_bus(hc->hw.fifos), | 1991 | (u_long) hc->hw.dmahandle, hc->irq, HZ); |
1992 | hc->irq, HZ); | ||
1993 | /* enable memory mapped ports, disable busmaster */ | 1992 | /* enable memory mapped ports, disable busmaster */ |
1994 | pci_write_config_word(hc->pdev, PCI_COMMAND, PCI_ENA_MEMIO); | 1993 | pci_write_config_word(hc->pdev, PCI_COMMAND, PCI_ENA_MEMIO); |
1995 | hc->hw.int_m2 = 0; | 1994 | hc->hw.int_m2 = 0; |