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

Commit 2e9ff8d9 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled 



Randy Dunlap reports that the ex131x driver doesn't build when CONFIG_PM_SLEEP is not enabled.
This bug was introduced when moving code around to remove some forward declarations earlier, the #endif part of #ifdef CONFIG_PM_SLEEP was not moved at the same time. Now fixed by moving it to its proper place.

Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cfcfc9ec

drivers/staging/et131x/et131x.c

+6 −6
Original line number Diff line number Diff line
@@ -4469,6 +4469,12 @@ static int et131x_resume(struct device *dev) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);

#define ET131X_PM_OPS (&et131x_pm_ops)

#else

#define ET131X_PM_OPS NULL

#endif



/* ISR functions */



/**
@@ -5470,12 +5476,6 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev, 
	return result;

}



static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);

#define ET131X_PM_OPS (&et131x_pm_ops)

#else

#define ET131X_PM_OPS NULL

#endif



static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = {

	{ PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_GIG), 0UL},

	{ PCI_VDEVICE(ATT, ET131X_PCI_DEVICE_ID_FAST), 0UL},