diff --git a/[refs] b/[refs] index f8880b917843..fc406be9cd5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cb0f819eb88f573703e9a73d9883febcfcfa1c3 +refs/heads/master: 3f878dbcd6ca4bbdbac0a1380d25161a7ba610ab diff --git a/trunk/drivers/usb/host/ohci-sa1111.c b/trunk/drivers/usb/host/ohci-sa1111.c index 50ebeb310fda..e797f18acb33 100644 --- a/trunk/drivers/usb/host/ohci-sa1111.c +++ b/trunk/drivers/usb/host/ohci-sa1111.c @@ -48,8 +48,7 @@ static int sa1111_start_hc(struct sa1111_dev *dev) unsigned int usb_rst = 0; int ret; - printk(KERN_DEBUG "%s: starting SA-1111 OHCI USB Controller\n", - __FILE__); + dev_dbg(&dev->dev, "starting SA-1111 OHCI USB Controller\n"); if (machine_is_xp860() || machine_has_neponset() || @@ -81,8 +80,7 @@ static void sa1111_stop_hc(struct sa1111_dev *dev) { unsigned int usb_rst; - printk(KERN_DEBUG "%s: stopping SA-1111 OHCI USB Controller\n", - __FILE__); + dev_dbg(&dev->dev, "stopping SA-1111 OHCI USB Controller\n"); /* * Put the USB host controller into reset.