Merge branch 'bcmgenet-next'

Florian Fainelli says: ==================== net: bcmgenet: PM and Wake-on-LAN This patchset brings S2/S3 Power Management support to the GENET driver as well as Wake-on-LAN using Magic Packets with or without SecureOn passwords. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
mariux64 · Jul 21, 2014 · bb1fed7 · bb1fed7
2 parents 575a193 + 06ba837
commit bb1fed7
Show file tree

Hide file tree

Showing 4 changed files with 430 additions and 60 deletions.
diff --git a/drivers/net/ethernet/broadcom/genet/Makefile b/drivers/net/ethernet/broadcom/genet/Makefile
@@ -1,2 +1,2 @@
 obj-$(CONFIG_BCMGENET) += genet.o
-genet-objs := bcmgenet.o bcmmii.o
+genet-objs := bcmgenet.o bcmmii.o bcmgenet_wol.o