diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-12-30 17:29:34 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-12-30 17:29:34 +0100 |
| commit | 6b1c374c45605504ed32e855c4e0f9b652a1978e (patch) | |
| tree | 2c1b90e6ef3c5fde1c871df110d7a3f8a2e3117d /drivers/scsi/mpi3mr | |
| parent | Linux 6.2-rc1 (diff) | |
| parent | scsi: ufs: core: WLUN suspend SSU/enter hibern8 fail recovery (diff) | |
| download | linux-6b1c374c45605504ed32e855c4e0f9b652a1978e.tar.xz linux-6b1c374c45605504ed32e855c4e0f9b652a1978e.zip | |
Merge branch '6.2/scsi-queue' into 6.2/scsi-fixes
Pull in remaining patches from the 6.2 queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/mpi3mr')
| -rw-r--r-- | drivers/scsi/mpi3mr/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpi3mr/Makefile b/drivers/scsi/mpi3mr/Makefile index ef86ca46646b..3bf8cf34e1c3 100644 --- a/drivers/scsi/mpi3mr/Makefile +++ b/drivers/scsi/mpi3mr/Makefile @@ -1,5 +1,5 @@ # mpi3mr makefile -obj-m += mpi3mr.o +obj-$(CONFIG_SCSI_MPI3MR) += mpi3mr.o mpi3mr-y += mpi3mr_os.o \ mpi3mr_fw.o \ mpi3mr_app.o \ |