From d4689e71e12a35a710ffdc6dddef2570d7c973dc Mon Sep 17 00:00:00 2001 From: Joachim Eastwood Date: Thu, 18 Oct 2012 11:01:13 +0000 Subject: [PATCH] --- yaml --- r: 340384 b: refs/heads/master c: 0112a1dac5e8e4164ed7ab0b919f47b4d4854249 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cadence/Kconfig | 2 +- trunk/drivers/net/ethernet/cadence/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 873c25f80a86..4f83206779ce 100644 --- 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 index db931916da08..57f78abe11d9 100644 --- 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 index 9068b8331ed1..798b1e0fd220 100644 --- 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