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

Commit bbbc4791 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: fix more ET131X build errors
  staging: et131x depends on NET
  staging: slicoss depends on NET
  linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled
parents 3c688149 c9fb041f

drivers/staging/et131x/Kconfig

+2 −1
Original line number Original line Diff line number Diff line 
config ET131X

config ET131X

	tristate "Agere ET-1310 Gigabit Ethernet support"

	tristate "Agere ET-1310 Gigabit Ethernet support"

	depends on PCI

	depends on PCI && NET && NETDEVICES

	select PHYLIB

	default n

	default n

	---help---

	---help---

	  This driver supports Agere ET-1310 ethernet adapters.

	  This driver supports Agere ET-1310 ethernet adapters.

drivers/staging/et131x/et131x.c

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

	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 */

/* ISR functions */





/**

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

	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) = {

static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = {

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

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

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

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

drivers/staging/slicoss/Kconfig

+1 −1
Original line number Original line Diff line number Diff line 
config SLICOSS

config SLICOSS

	tristate "Alacritech Gigabit IS-NIC support"

	tristate "Alacritech Gigabit IS-NIC support"

	depends on PCI && X86

	depends on PCI && X86 && NET

	default n

	default n

	help

	help

	  This driver supports Alacritech's IS-NIC gigabit ethernet cards.

	  This driver supports Alacritech's IS-NIC gigabit ethernet cards.