Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353541
b: refs/heads/master
c: 18a41e3
h: refs/heads/master
i:
  353539: 5a12bef
v: v3
  • Loading branch information
Kees Cook committed Jan 11, 2013
1 parent 47d6e41 commit afc741d
Show file tree
Hide file tree
Showing 2 changed files with 6 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: cb40390b86029051900e57307815e243cce126c6
refs/heads/master: 18a41e36f2d9ab3784b38c582602b6e2d9487ad6
12 changes: 5 additions & 7 deletions trunk/drivers/net/ethernet/i825xx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
config NET_VENDOR_I825XX
bool "Intel (82586/82593/82596) devices"
default y
depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
GSC || BVME6000 || MVME16x || EXPERIMENTAL)
depends on NET_VENDOR_INTEL
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
Expand All @@ -33,8 +31,8 @@ config ELPLUS
will be called 3c505.

config EL16
tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
depends on ISA && EXPERIMENTAL
tristate "3c507 \"EtherLink 16\" support"
depends on ISA
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
Expand Down Expand Up @@ -149,8 +147,8 @@ config SUN3_82586
VME boards.

config ZNET
tristate "Zenith Z-Note support (EXPERIMENTAL)"
depends on EXPERIMENTAL && ISA_DMA_API && X86
tristate "Zenith Z-Note support"
depends on ISA_DMA_API && X86
---help---
The Zenith Z-Note notebook computer has a built-in network
(Ethernet) card, and this is the Linux driver for it. Note that the
Expand Down

0 comments on commit afc741d

Please sign in to comment.