]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-5.15/iommu-mtk-fix-module-autoloading.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 May 2024 07:54:35 +0000 (09:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 May 2024 07:54:35 +0000 (09:54 +0200)
queue-5.15/iommu-mtk-fix-module-autoloading.patch

index a9a85312059d344ad3ce19af116b2adfe49d4e6c..7bc3ee4112659259c58220b1e555a6b2ec18e749 100644 (file)
@@ -15,15 +15,13 @@ Link: https://lore.kernel.org/r/20240410164109.233308-1-krzk@kernel.org
 Signed-off-by: Joerg Roedel <jroedel@suse.de>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/iommu/mtk_iommu.c    | 1 +
- drivers/iommu/mtk_iommu_v1.c | 1 +
+ drivers/iommu/mtk_iommu.c    |    1 +
+ drivers/iommu/mtk_iommu_v1.c |    1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
-index 2ae46fa6b3dee..04ac40d11fdff 100644
 --- a/drivers/iommu/mtk_iommu.c
 +++ b/drivers/iommu/mtk_iommu.c
-@@ -1101,6 +1101,7 @@ static const struct of_device_id mtk_iommu_of_ids[] = {
+@@ -1101,6 +1101,7 @@ static const struct of_device_id mtk_iom
        { .compatible = "mediatek,mt8192-m4u", .data = &mt8192_data},
        {}
  };
@@ -31,18 +29,13 @@ index 2ae46fa6b3dee..04ac40d11fdff 100644
  
  static struct platform_driver mtk_iommu_driver = {
        .probe  = mtk_iommu_probe,
-diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
-index fe1c3123a7e77..3a52f6a6ecb32 100644
 --- a/drivers/iommu/mtk_iommu_v1.c
 +++ b/drivers/iommu/mtk_iommu_v1.c
-@@ -576,6 +576,7 @@ static const struct of_device_id mtk_iommu_of_ids[] = {
+@@ -576,6 +576,7 @@ static const struct of_device_id mtk_iom
        { .compatible = "mediatek,mt2701-m4u", },
        {}
  };
-+MODULE_DEVICE_TABLE(of, mtk_iommu_v1_of_ids);
++MODULE_DEVICE_TABLE(of, mtk_iommu_of_ids);
  
  static const struct component_master_ops mtk_iommu_com_ops = {
        .bind           = mtk_iommu_bind,
--- 
-2.43.0
-