From patchwork Sun Oct 21 14:23:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 193005 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 692EA2C007C for ; Mon, 22 Oct 2012 01:23:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932078Ab2JUOXu (ORCPT ); Sun, 21 Oct 2012 10:23:50 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:46562 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753665Ab2JUOXh (ORCPT ); Sun, 21 Oct 2012 10:23:37 -0400 Received: by mail-la0-f46.google.com with SMTP id h6so1120295lag.19 for ; Sun, 21 Oct 2012 07:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=/DOARRXWnhoi3pDLjqdgqFQjt6b5JoiL9f9BwlAraZw=; b=BQlHluCtkwevYlSF0hZ1eCOX9wg9r2+piXZBJmwSiSbOMxIMVSd7OJdXO+mCNVor5h ClhBEXJcKMp1cogvC/UFfw686IK4cNKuBzBrSIJd9dHdGq6LpzB2/IlGx+U2WYwnGPYP 0XCWwOJZcbyB3uH5UIfcg3+q3MdQnhkIHS0gmRo9+Q5G4+KHRIl0aLbmeFqCIaTB2gpz bYjykLq/GlUUS3SRciv+kUw8BwYdljVFB0NjWYv4lltjxPtAbZ1eS5/HAuXbm7jE7Xmu QLGAEJkCyrkdzHTn/0tjcDG1iZoH0jh5Fl3FI7aG0ZvlROYQ3tHQT5o85qnRwrNlFMiA lEbg== Received: by 10.152.104.77 with SMTP id gc13mr5779380lab.16.1350829415659; Sun, 21 Oct 2012 07:23:35 -0700 (PDT) Received: from localhost.localdomain ([90.149.223.57]) by mx.google.com with ESMTPS id jk8sm2149775lab.7.2012.10.21.07.23.34 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Oct 2012 07:23:35 -0700 (PDT) From: Joachim Eastwood To: nicolas.ferre@atmel.com, davem@davemloft.net, hskinnemoen@gmail.com, egtvedt@samfundet.no, plagnioj@jcrosoft.com, bgat@billgatliff.com Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Joachim Eastwood Subject: [PATCH 2/5] net/at91_ether: select MACB in Kconfig Date: Sun, 21 Oct 2012 16:23:09 +0200 Message-Id: <1350829392-3812-3-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1350829392-3812-1-git-send-email-manabian@gmail.com> References: <1350829392-3812-1-git-send-email-manabian@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now that HAVE_NET_MACB is gone let's just select MACB to satisfy the dependecies in at91_ether. PHYLIB will then by selected by MACB. Signed-off-by: Joachim Eastwood --- drivers/net/ethernet/cadence/Kconfig | 2 +- drivers/net/ethernet/cadence/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index 5d1ea30..f6d0956 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/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/drivers/net/ethernet/cadence/Makefile b/drivers/net/ethernet/cadence/Makefile index 798b1e0..9068b83 100644 --- a/drivers/net/ethernet/cadence/Makefile +++ b/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