In 70f5e23f0751 ("Merge branch 'v5.10/standard/base' into
v5.10/standard/nxp-sdk-5.10/nxp-soc") there was a conflict between
linux-stable backport
1da5d2497046 ("dmaengine: mxs-dma: Remove the unused .id_table")
and existing nxp SDK commits.

Remove the unnecessary .id_table assignment to fix the following build failure:
| 'mxs_dma_ids' undeclared here (not in a function); did you mean 'mxs_dma_id'?
|   962 |         .id_table       = mxs_dma_ids,
|       |                           ^~~~~~~~~~~
|       |                           mxs_dma_id

Signed-off-by: Ovidiu Panait <[email protected]>
---
 drivers/dma/mxs-dma.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index d6b006a701f6..3dfbcfe2ff56 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -959,7 +959,6 @@ static struct platform_driver mxs_dma_driver = {
                .pm = &mxs_dma_pm_ops,
                .of_match_table = mxs_dma_dt_ids,
        },
-       .id_table       = mxs_dma_ids,
        .remove         = mxs_dma_remove,
        .probe = mxs_dma_probe,
 };
-- 
2.31.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11835): 
https://lists.yoctoproject.org/g/linux-yocto/message/11835
Mute This Topic: https://lists.yoctoproject.org/mt/94752819/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to