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

db62983a · David S. Miller · 9e1453c5 · f6d7f2c6 · db62983a · db62983a
Commit db62983a authored Feb 22, 2011 by David S. Miller
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 395 additions and 419 deletions

drivers/net/Kconfig drivers/net/Kconfig +2 -2

drivers/net/ax88796.c drivers/net/ax88796.c +393 -417

No files found.
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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

--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c