Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/staging/comedi/drivers/usbdux.c b/drivers/staging/comedi/drivers/usbdux.c
index de784ff08caaef9665e63a66d107a888400301cc..696ee045e25f30ce1be96aded6c39d743287cac6 100644 (file)
--- a/drivers/staging/comedi/drivers/usbdux.c
+++ b/drivers/staging/comedi/drivers/usbdux.c
@@ -2398,7 +2398,7 @@ static int usbduxsub_probe(struct usb_interface *uinterf,
        usbduxsub[index].dux_commands = kzalloc(SIZEOFDUXBUFFER, GFP_KERNEL);
        if (!usbduxsub[index].dux_commands) {
                dev_err(dev, "comedi_: usbdux: "
-                       "error alloc space for dac commands\n");
+                       "error alloc space for dux commands\n");
                tidy_up(&(usbduxsub[index]));
                up(&start_stop_sem);
                return -ENOMEM;