| Message ID | 20170626170709.dlapct54eaudkj2u@xps13.dannf |
|---|---|
| State | New |
| Headers | show |
On Mon, Jun 26, 2017 at 11:07:10AM -0600, dann frazier wrote: > 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@canonical.com> Applied to artful/master-next and unstable/master, thanks.
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 ?
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@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(-)