---

yaml --- r: 340384 b: refs/heads/master c: 0112a1d h: refs/heads/master v: v3
git-mirror · Oct 19, 2012 · d4689e7 · d4689e7
1 parent 0329f01
commit d4689e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0005f54102a7bcaffc9caa73db7d04d7587ab3c3
+refs/heads/master: 0112a1dac5e8e4164ed7ab0b919f47b4d4854249
diff --git a/trunk/drivers/net/ethernet/cadence/Kconfig b/trunk/drivers/net/ethernet/cadence/Kconfig
@@ -27,7 +27,7 @@ config ARM_AT91_ETHER
 	tristate "AT91RM9200 Ethernet support"
 	depends on ARM && ARCH_AT91RM9200
 	select NET_CORE
-	select MII
+	select PHYLIB
 	---help---
 	  If you wish to compile a kernel for the AT91RM9200 and enable
 	  ethernet support, then you should always answer Y to this.

diff --git a/trunk/drivers/net/ethernet/cadence/Makefile b/trunk/drivers/net/ethernet/cadence/Makefile
@@ -2,5 +2,5 @@
 # Makefile for the Atmel network device drivers.
 #
 
-obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
+obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o macb.o
 obj-$(CONFIG_MACB) += macb.o