Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 380bab10 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 7cf75262 d6f8aa85

drivers/net/atl1e/atl1e_main.c

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

	return 0;

}

}





#ifdef CONFIG_PM

static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)

static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)

{

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct net_device *netdev = pci_get_drvdata(pdev);
@@ -2207,6 +2206,7 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_PM

static int atl1e_resume(struct pci_dev *pdev)

static int atl1e_resume(struct pci_dev *pdev)

{

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct net_device *netdev = pci_get_drvdata(pdev);