Merge branch 'net/ax88796' of git://git.pengutronix.de/git/mkl/linux-2.6

This commit is contained in:
David S. Miller 2011-02-22 11:15:29 -08:00
commit db62983a1e
2 changed files with 401 additions and 425 deletions

View file

@ -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

File diff suppressed because it is too large Load diff