diff --git a/[refs] b/[refs] index fefe6aa00fdd..110fc7531e54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c8b2eb4c71d5c3d45dbfe0c81fefe81e264e9b3 +refs/heads/master: e53091fae52931a96dfb661f2b78e0a91e5f9978 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index bda6095f3120..14a76f7cf900 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -1346,10 +1346,8 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out, } else { if (netif_msg_probe(tp)) { printk(KERN_ERR PFX - "Cannot find PowerManagement capability. " - "Aborting.\n"); + "PowerManagement capability not found.\n"); } - goto err_out_mwi; } /* make sure PCI base addr 1 is MMIO */