From c0b7583356c47acf278ac40e6bab2192364fcb16 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 15 May 2024 09:54:35 +0200 Subject: [PATCH] fix up queue-5.15/iommu-mtk-fix-module-autoloading.patch --- .../iommu-mtk-fix-module-autoloading.patch | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/queue-5.15/iommu-mtk-fix-module-autoloading.patch b/queue-5.15/iommu-mtk-fix-module-autoloading.patch index a9a85312059..7bc3ee41126 100644 --- a/queue-5.15/iommu-mtk-fix-module-autoloading.patch +++ b/queue-5.15/iommu-mtk-fix-module-autoloading.patch @@ -15,15 +15,13 @@ Link: https://lore.kernel.org/r/20240410164109.233308-1-krzk@kernel.org Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- - 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 - -- 2.47.3