From d73f57db45877fe1e0f2f2d07c35102b8d2720ad Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 12 Feb 2019 19:56:47 +0000 Subject: [PATCH] [powerpc*] udeb: Remove redundant lines from scsi-modules The a100u2w, ibmvscsi, mac53c94, mesh, and ps3rom drivers are built under drivers/scsi so don't need to be specifically included. The ps3rom driver then doesn't need to be excluded on ppc64el. The ps3disk driver is a SATA driver not a SCSI driver, so add a comment to explain why it's here. --- debian/installer/modules/powerpc-powerpc64/scsi-modules | 5 ++--- debian/installer/modules/powerpc/scsi-modules | 4 ---- debian/installer/modules/ppc64el/scsi-modules | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/debian/installer/modules/powerpc-powerpc64/scsi-modules b/debian/installer/modules/powerpc-powerpc64/scsi-modules index d0671e575..74a817729 100644 --- a/debian/installer/modules/powerpc-powerpc64/scsi-modules +++ b/debian/installer/modules/powerpc-powerpc64/scsi-modules @@ -1,8 +1,7 @@ -#include +#include "../powerpc/scsi-modules" -ibmvscsi +# Really SATA, but keep it with ps3rom as they both depend on ps3stor_lib ps3disk ? -ps3rom # Exclude target driver ibmvscsis - diff --git a/debian/installer/modules/powerpc/scsi-modules b/debian/installer/modules/powerpc/scsi-modules index c75c32da5..8909dfb79 100644 --- a/debian/installer/modules/powerpc/scsi-modules +++ b/debian/installer/modules/powerpc/scsi-modules @@ -1,5 +1 @@ #include - -a100u2w -mac53c94 -mesh diff --git a/debian/installer/modules/ppc64el/scsi-modules b/debian/installer/modules/ppc64el/scsi-modules index da5091e04..c3979d673 100644 --- a/debian/installer/modules/ppc64el/scsi-modules +++ b/debian/installer/modules/ppc64el/scsi-modules @@ -1,3 +1 @@ #include "../ppc64/scsi-modules" - -ps3rom -