Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/e1000e/netdev.c
	net/xfrm/xfrm_policy.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 680f2ef4e59f..f784ceb862a3 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -796,7 +796,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
         hcd = usb_create_hcd(&ehci_omap_hc_driver, &pdev->dev,
                         dev_name(&pdev->dev));
         if (!hcd) {
-                dev_dbg(&pdev->dev, "failed to create hcd with err %d\n", ret);
+                dev_err(&pdev->dev, "failed to create hcd with err %d\n", ret);
                 ret = -ENOMEM;
                 goto err_create_hcd;
         }
@@ -864,7 +864,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 
         ret = omap_start_ehc(omap, hcd);
         if (ret) {
-                dev_dbg(&pdev->dev, "failed to start ehci\n");
+                dev_err(&pdev->dev, "failed to start ehci with err %d\n", ret);
                 goto err_start;
         }
 
@@ -879,7 +879,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 
         ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
         if (ret) {
-                dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);
+                dev_err(&pdev->dev, "failed to add hcd with err %d\n", ret);
                 goto err_add_hcd;
         }