---

yaml --- r: 340406 b: refs/heads/master c: 72ec301 h: refs/heads/master v: v3
git-mirror · Oct 20, 2012 · 2256165 · 2256165
1 parent 2cf132d
commit 2256165
Show file tree

Hide file tree

Showing 8 changed files with 208 additions and 1,106 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a05004a8a65f187fa5493821d3115397209ae76
+refs/heads/master: 72ec301a27badb11635b08dc845101815abcf4a7
diff --git a/trunk/arch/arm/mach-at91/include/mach/at91rm9200_emac.h b/trunk/arch/arm/mach-at91/include/mach/at91rm9200_emac.h
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