From d8d098494b675e996aa05c4730755070b9c320a7 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 14 Jul 2001 21:41:24 +0000 Subject: [PATCH] Resolve conflict with function defined in PPC kernel --- comedi/drivers/ni_at_a2150.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.26.2