Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-11-21 20:37:34 -08:00
commit bbbc4791cd
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/et131x/Kconfig
View File

@ -1,6 +1,7 @@
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.

12
drivers/staging/et131x/et131x.c
View File

@ -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 @@ err_out:
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},

2
drivers/staging/slicoss/Kconfig
View File

@ -1,6 +1,6 @@
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.