Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211403
b: refs/heads/master
c: 10ccff6
h: refs/heads/master
i:
  211401: 407a60c
  211399: b7f1f1b
v: v3
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Oct 4, 2010
1 parent bd77b34 commit e6ebe6b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c5d3557103f8bef81d7a150ab9cc970099cd58a2
refs/heads/master: 10ccff62bd3de7a64cf98f4c37ec0414b8affd4f
4 changes: 2 additions & 2 deletions trunk/drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2428,7 +2428,7 @@ config UGETH_TX_ON_DEMAND

config MV643XX_ETH
tristate "Marvell Discovery (643XX) and Orion ethernet support"
depends on MV64X60 || PPC32 || PLAT_ORION
depends on (MV64X60 || PPC32 || PLAT_ORION) && INET
select INET_LRO
select PHYLIB
help
Expand Down Expand Up @@ -2803,7 +2803,7 @@ config NIU

config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI
depends on PPC_PASEMI && PCI && INET
select PHYLIB
select INET_LRO
help
Expand Down

0 comments on commit e6ebe6b

Please sign in to comment.