[PATCH][Artful][Unstable] UBUNTU: d-i: Move qcom-emac from arm64 to shared nic-modules

dann frazier dann.frazier at canonical.com
Mon Jun 26 17:07:10 UTC 2017


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 <dann.frazier at canonical.com>
---
 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 <nic-modules>
-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 ?
-- 
2.13.1





More information about the kernel-team mailing list