Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 215181
b: refs/heads/master
c: 81ccb49
h: refs/heads/master
i:
  215179: c8272ab
v: v3
  • Loading branch information
Randy Dunlap authored and David S. Miller committed Oct 16, 2010
1 parent e5b1c71 commit d13d140
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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: e00ce92e0bb966227e88d674d4f7311f4f3bacac
refs/heads/master: 81ccb499e7c5ae47e988e59a4e40a6d5ee66af79
14 changes: 7 additions & 7 deletions trunk/drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ config NET_SB1000

source "drivers/net/arcnet/Kconfig"

config MII
tristate "Generic Media Independent Interface device support"
help
Most ethernet controllers have MII transceiver either as an external
or internal device. It is safe to say Y or M here even if your
ethernet card lacks MII.

source "drivers/net/phy/Kconfig"

#
Expand Down Expand Up @@ -212,13 +219,6 @@ menuconfig NET_ETHERNET

if NET_ETHERNET

config MII
tristate "Generic Media Independent Interface device support"
help
Most ethernet controllers have MII transceiver either as an external
or internal device. It is safe to say Y or M here even if your
ethernet card lack MII.

config MACB
tristate "Atmel MACB support"
depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45 || ARCH_AT91CAP9
Expand Down

0 comments on commit d13d140

Please sign in to comment.