Skip to content

Commit

Permalink
Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
David S. Miller committed Feb 22, 2011
2 parents 9e1453c + f6d7f2c commit db62983
Show file tree
Hide file tree
Showing 2 changed files with 395 additions and 419 deletions.
4 changes: 2 additions & 2 deletions drivers/net/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ source "drivers/net/arm/Kconfig"
config AX88796
tristate "ASIX AX88796 NE2000 clone support"
depends on ARM || MIPS || SUPERH
select CRC32
select MII
select PHYLIB
select MDIO_BITBANG
help
AX88796 driver, using platform bus to provide
chip detection and resources
Expand Down
Loading

0 comments on commit db62983

Please sign in to comment.