Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (380bab10) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/atl1e/atl1e_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2073,7 +2073,6 @@ static int atl1e_close(struct net_device *netdev)
		return 0;
		}

		#ifdef CONFIG_PM
		static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
		{
		struct net_device *netdev = pci_get_drvdata(pdev);
		@@ -2207,6 +2206,7 @@ suspend_exit:
		return 0;
		}

		#ifdef CONFIG_PM
		static int atl1e_resume(struct pci_dev *pdev)
		{
		struct net_device *netdev = pci_get_drvdata(pdev);