From: David Schleef <ds@schleef.org>
Date: Sat, 14 Jul 2001 21:41:24 +0000 (+0000)
Subject: Resolve conflict with function defined in PPC kernel
X-Git-Tag: r0_7_60~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8d098494b675e996aa05c4730755070b9c320a7;p=comedi.git

Resolve conflict with function defined in PPC kernel
---

diff --git a/comedi/drivers/ni_at_a2150.c b/comedi/drivers/ni_at_a2150.c
index fca35ba8..364daf65 100644
--- a/comedi/drivers/ni_at_a2150.c
+++ b/comedi/drivers/ni_at_a2150.c
@@ -169,7 +169,7 @@ COMEDI_INITCLEANUP(driver_a2150);
 
 #ifdef A2150_DEBUG
 
-void dump_regs(comedi_device *dev)
+void ni_dump_regs(comedi_device *dev)
 {
 	rt_printk("config bits 0x%x\n", devpriv->config_bits);
 	rt_printk("irq dma bits 0x%x\n", devpriv->irq_dma_bits);
@@ -661,7 +661,7 @@ static int a2150_ai_cmd(comedi_device *dev, comedi_subdevice *s)
 	outw(0, dev->iobase + FIFO_START_REG);
 
 #ifdef A2150_DEBUG
-	dump_regs(dev);
+	ni_dump_regs(dev);
 #endif
 
 	return 0;