From d804f9afe95c135f841e09dc9ec5d63cc4849ec6 Mon Sep 17 00:00:00 2001 From: Joachim Eastwood Date: Mon, 22 Oct 2012 08:45:33 +0000 Subject: [PATCH] --- yaml --- r: 340433 b: refs/heads/master c: f4a15e1b293b0de21bab6d9c258f162d9efff9e2 h: refs/heads/master i: 340431: 192d728b41f1c0798afeaf647038f4e493ac9c9c 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 c6a49c1ac159..0478703d7054 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84222e20c1823b5fd3216be46689693bd913bd0b +refs/heads/master: f4a15e1b293b0de21bab6d9c258f162d9efff9e2 diff --git a/trunk/drivers/net/ethernet/cadence/Kconfig b/trunk/drivers/net/ethernet/cadence/Kconfig index 5d1ea30a3379..f6d0956485f1 100644 --- a/trunk/drivers/net/ethernet/cadence/Kconfig +++ b/trunk/drivers/net/ethernet/cadence/Kconfig @@ -23,7 +23,7 @@ config ARM_AT91_ETHER tristate "AT91RM9200 Ethernet support" depends on ARM && ARCH_AT91RM9200 select NET_CORE - select PHYLIB + select MACB ---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 798b1e0fd220..9068b8331ed1 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 macb.o +obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_MACB) += macb.o