From patchwork Mon Jun 26 17:07:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 780803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3wxFq35n7Zz9s81; Tue, 27 Jun 2017 03:07:27 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1dPXTr-0002hz-D4; Mon, 26 Jun 2017 17:07:19 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dPXTl-0002ht-EN for kernel-team@lists.ubuntu.com; Mon, 26 Jun 2017 17:07:13 +0000 Received: from localhost (c-107-2-141-92.hsd1.co.comcast.net [107.2.141.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id 4239133E013F for ; Mon, 26 Jun 2017 11:07:10 -0600 (MDT) Date: Mon, 26 Jun 2017 11:07:10 -0600 From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH][Artful][Unstable] UBUNTU: d-i: Move qcom-emac from arm64 to shared nic-modules Message-ID: <20170626170709.dlapct54eaudkj2u@xps13.dannf> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on complete.lackof.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com qcom-emac is currently listed in the arm64-specific nic-modules list instead of the shared nic-modules list. This unnecessarily makes arm64 different than every other arch that just #includes the shared list. The "?" qualifier is enough to make it safe, as it prevents a build failure if the driver is not available on that architecture. Signed-off-by: dann frazier --- debian.master/d-i/modules/arm64/nic-modules | 1 - debian.master/d-i/modules/nic-modules | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.master/d-i/modules/arm64/nic-modules b/debian.master/d-i/modules/arm64/nic-modules index 433d734d8706..2512e83950dd 100644 --- a/debian.master/d-i/modules/arm64/nic-modules +++ b/debian.master/d-i/modules/arm64/nic-modules @@ -1,2 +1 @@ #include -qcom-emac ? diff --git a/debian.master/d-i/modules/nic-modules b/debian.master/d-i/modules/nic-modules index f1066430b2af..0bf9495f462c 100644 --- a/debian.master/d-i/modules/nic-modules +++ b/debian.master/d-i/modules/nic-modules @@ -137,6 +137,7 @@ orinoco_pci ? orinoco_plx ? orinoco_tmd ? pcnet32 ? +qcom-emac ? qeth ? qeth_l2 ? qeth_l3 ?