Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

[mv-sheeva.git] / drivers / usb / misc / ldusb.c

diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 90f130126c10d605db2115ee6c16afe8329266cb..dd41d871004353b5e8bccba16b8899d4aa53aa5a 100644 (file)
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -69,7 +69,7 @@
 #endif
 
 /* table of devices that work with this driver */
-static struct usb_device_id ld_usb_table [] = {
+static const struct usb_device_id ld_usb_table[] = {
        { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },
        { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },
        { USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },
@@ -798,7 +798,7 @@ static int __init ld_usb_init(void)
        /* register this driver with the USB subsystem */
        retval = usb_register(&ld_usb_driver);
        if (retval)
-               err("usb_register failed for the "__FILE__" driver. Error number %d\n", retval);
+               err("usb_register failed for the %s driver. Error number %d\n", __FILE__, retval);
 
        return retval;
 }