From patchwork Tue Sep 6 08:35:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ming X-Patchwork-Id: 113507 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 B5A93B6F7C for ; Tue, 6 Sep 2011 18:35:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753445Ab1IFIfc (ORCPT ); Tue, 6 Sep 2011 04:35:32 -0400 Received: from mga11.intel.com ([192.55.52.93]:46745 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753296Ab1IFIfb (ORCPT ); Tue, 6 Sep 2011 04:35:31 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 06 Sep 2011 01:35:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,337,1312182000"; d="scan'208";a="48422828" Received: from snb.sh.intel.com (HELO [10.239.13.8]) ([10.239.13.8]) by fmsmga001.fm.intel.com with ESMTP; 06 Sep 2011 01:35:29 -0700 Subject: [PATCH -next] drivers/net: Makefile, fix netconsole link order From: Lin Ming To: "David S. Miller" Cc: lkml , netdev@vger.kernel.org, Jeff Kirsher Date: Tue, 06 Sep 2011 16:35:29 +0800 Message-ID: <1315298129.16061.24.camel@snb> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 88491d8(drivers/net: Kconfig & Makefile cleanup) causes a regression that netconsole does not work if netconsole and network device driver are build into kernel, because netconsole is linked before network device driver. Fixes it by moving netconsole.o after network device driver. Signed-off-by: Lin Ming --- drivers/net/Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index fa877cd..ec15311 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_MACVTAP) += macvtap.o obj-$(CONFIG_MII) += mii.o obj-$(CONFIG_MDIO) += mdio.o obj-$(CONFIG_NET) += Space.o loopback.o -obj-$(CONFIG_NETCONSOLE) += netconsole.o obj-$(CONFIG_PHYLIB) += phy/ obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_TUN) += tun.o @@ -66,3 +65,9 @@ obj-$(CONFIG_USB_USBNET) += usb/ obj-$(CONFIG_USB_ZD1201) += usb/ obj-$(CONFIG_USB_IPHETH) += usb/ obj-$(CONFIG_USB_CDC_PHONET) += usb/ + +# +# If netconsole and network device driver are build-in, +# netconsole must be linked after network device driver +# +obj-$(CONFIG_NETCONSOLE) += netconsole.o