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

2011-02-22 11:15:29 -08:00 · 2011-02-22 11:15:29 -08:00 · db62983a1e
--- 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