Changes for 2.6.29 kernel. info() removed from <linux/usb.h>.

diff --git a/comedi/drivers/dt9812.c b/comedi/drivers/dt9812.c
index c3e8a60b09e1ec97f4f6d1b104dba9316460cd69..8afb9cb97c1c015caa8da2f326d659fd981f7f18 100644 (file)
--- a/comedi/drivers/dt9812.c
+++ b/comedi/drivers/dt9812.c
@@ -609,7 +609,7 @@ static int dt9812_probe(struct usb_interface *interface,
        usb_set_intfdata(interface, dev);
 
        // let the user know what node this device is now attached to
-       info("USB DT9812 (%4.4x.%4.4x.%4.4x) #0x%8.8x",
+       dev_info(&interface->dev, "USB DT9812 (%4.4x.%4.4x.%4.4x) #0x%8.8x\n",
                dev->vendor, dev->product, dev->device, dev->serial);
 
        down(&dt9812_mutex);
@@ -668,7 +668,7 @@ static void dt9812_disconnect(struct usb_interface *interface)
        /* queue final destruction */
        kref_put(&dev->kref, dt9812_delete);
 
-       info("USB Dt9812 #%d now disconnected", minor);
+       dev_info(&interface->dev, "USB Dt9812 #%d now disconnected\n", minor);
 }
 
 static struct usb_driver dt9812_usb_driver = {

diff --git a/comedi/drivers/usbdux.c b/comedi/drivers/usbdux.c
index 14202a15bdc3721123b438a4bd7778d8cff9fdf7..11e9572c47e14bf7f269b650cb9766ebb765e639 100644 (file)
--- a/comedi/drivers/usbdux.c
+++ b/comedi/drivers/usbdux.c
@@ -2992,7 +2992,8 @@ static struct usb_driver usbduxsub_driver = {
 // registering the usb-system _and_ the comedi-driver
 static int init_usbdux(void)
 {
-       info(DRIVER_VERSION ":" DRIVER_DESC);
+       printk(KERN_INFO KBUILD_MODNAME ": "
+              DRIVER_VERSION ":" DRIVER_DESC "\n");
        init_usb_devices();
        usb_register(&usbduxsub_driver);
        comedi_driver_register(&driver_usbdux);

diff --git a/comedi/drivers/usbduxfast.c b/comedi/drivers/usbduxfast.c
index a42efb8dd4b11afe303551ab2f3f2ae23d6db238..c20c769fdb09e37d1140edd6bf724e44770cee97 100644 (file)
--- a/comedi/drivers/usbduxfast.c
+++ b/comedi/drivers/usbduxfast.c
@@ -1791,7 +1791,8 @@ static struct usb_driver usbduxfastsub_driver = {
 // registering the usb-system _and_ the comedi-driver
 static int init_usbduxfast(void)
 {
-       info(DRIVER_VERSION ":" DRIVER_DESC);
+       printk(KERN_INFO KBUILD_MODNAME ": "
+              DRIVER_VERSION ":" DRIVER_DESC "\n");
        init_usb_devices();
        usb_register(&usbduxfastsub_driver);
        comedi_driver_register(&driver_usbduxfast);