bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_ccat_aarch64' into 'stable-1.6' 

Fix ccat for aarch64 >= 6.11.0

See merge request etherlab.org/ethercat!151
This commit is contained in:
Florian Pose 2025-02-06 08:26:12 +00:00
parent dab517b9ca de9efb7770
commit d15936b8b5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devices/ccat/module.c
View File

@ -398,7 +398,11 @@ static int ccat_eim_probe(struct platform_device *pdev)
return 0;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,11,0)
static void ccat_eim_remove(struct platform_device *pdev)
#else
static int ccat_eim_remove(struct platform_device *pdev)
#endif
{
struct ccat_device *ccatdev = platform_get_drvdata(pdev);
@ -407,7 +411,9 @@ static int ccat_eim_remove(struct platform_device *pdev)
iounmap(ccatdev->bar_0);
release_mem_region(0xf0000000, 0x02000000);
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
return 0;
#endif
}
static const struct of_device_id bhf_eim_ccat_ids[] = {