Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 into grant

[~andy/linux] / drivers / video / udlfb.c

diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index e9d43b403432b1568245358ce662e082caa7ca85..8af64148294b88074a269f54691d05a9cb00a547 100644 (file)
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -1594,7 +1594,7 @@ static int dlfb_usb_probe(struct usb_interface *interface,
 
        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (dev == NULL) {
-               err("dlfb_usb_probe: failed alloc of dev struct\n");
+               dev_err(&interface->dev, "dlfb_usb_probe: failed alloc of dev struct\n");
                goto error;
        }