Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / rti802.c

diff --git a/drivers/staging/comedi/drivers/rti802.c b/drivers/staging/comedi/drivers/rti802.c
index 2f75c737ea158ec6a2e3d13a6edda448e3d94b4b..2157edcf7997e96ebd11ea654007b325d366140f 100644 (file)
--- a/drivers/staging/comedi/drivers/rti802.c
+++ b/drivers/staging/comedi/drivers/rti802.c
@@ -106,9 +106,9 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        unsigned long iobase;
 
        iobase = it->options[0];
-       printk("comedi%d: rti802: 0x%04lx ", dev->minor, iobase);
+       printk(KERN_INFO "comedi%d: rti802: 0x%04lx ", dev->minor, iobase);
        if (!request_region(iobase, RTI802_SIZE, "rti802")) {
-               printk("I/O port conflict\n");
+               printk(KERN_WARNING "I/O port conflict\n");
                return -EIO;
        }
        dev->iobase = iobase;
@@ -138,14 +138,12 @@ static int rti802_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                    ? &range_unipolar10 : &range_bipolar10;
        }
 
-       printk("\n");
-
        return 0;
 }
 
 static int rti802_detach(struct comedi_device *dev)
 {
-       printk("comedi%d: rti802: remove\n", dev->minor);
+       printk(KERN_INFO "comedi%d: rti802: remove\n", dev->minor);
 
        if (dev->iobase)
                release_region(dev->iobase, RTI802_SIZE);