From b06fe35d7f9abf9920d796528103266673761eef Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 12 Feb 2019 16:44:45 +0000 Subject: [PATCH] [powerpc*] udeb: Remove redundant lines from nic-modules The bmac, ehea, ibmveth, ps3_gelic, spidernet, sungem, sungem_phy, and sunhme drivers are built under drivers/net/ethernet so don't need to be specifically included. pasemi_mac has been renamed to pasemi_mac_driver, and is also under drivers/net/ethernet. The ehea, ps3_gelic, and spidernet drivers then don't need to be excluded on ppc64el. Make the airport driver optional now, so that it doesn't need to be excluded on ppc64el. I will move it to nic-wireless-modules next. --- debian/installer/modules/powerpc-powerpc64/nic-modules | 6 ------ debian/installer/modules/powerpc/nic-modules | 9 ++++----- debian/installer/modules/ppc64el/nic-modules | 5 ----- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/debian/installer/modules/powerpc-powerpc64/nic-modules b/debian/installer/modules/powerpc-powerpc64/nic-modules index 95052e977..7578f4332 100644 --- a/debian/installer/modules/powerpc-powerpc64/nic-modules +++ b/debian/installer/modules/powerpc-powerpc64/nic-modules @@ -1,7 +1 @@ #include "../powerpc/nic-modules" - -ehea -ibmveth -pasemi_mac ? -ps3_gelic -spidernet diff --git a/debian/installer/modules/powerpc/nic-modules b/debian/installer/modules/powerpc/nic-modules index fa151067e..9c8572bd3 100644 --- a/debian/installer/modules/powerpc/nic-modules +++ b/debian/installer/modules/powerpc/nic-modules @@ -1,8 +1,7 @@ #include +# Include AppleTalk-IP driver ipddp -sunhme -airport -sungem -sungem_phy -bmac ? + +# XXX Belongs in nic-wireless-modules +airport ? diff --git a/debian/installer/modules/ppc64el/nic-modules b/debian/installer/modules/ppc64el/nic-modules index 5af435ef4..f69226417 100644 --- a/debian/installer/modules/ppc64el/nic-modules +++ b/debian/installer/modules/ppc64el/nic-modules @@ -1,6 +1 @@ #include "../ppc64/nic-modules" - -airport - -ehea - -ps3_gelic - -spidernet -