Merge pull request #101 from gwenhael-le-moine/main

fix compilation with kernel 6.11 (.0-rc6)
This commit is contained in:
Frederic BOLTZ 2024-09-02 14:45:52 +00:00 committed by GitHub
commit f45b72a6ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -37,8 +37,13 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#ifndef MIN
#define MIN(a,b) (((a)<(b))?(a):(b))
#endif
#ifndef MAX
#define MAX(a,b) (((a)>(b))?(a):(b))
#endif
enum kinds
{
@ -1162,6 +1167,8 @@ static int nct6687_resume(struct platform_device *pdev)
#define NCT6687_DEV_PM_OPS NULL
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
static struct platform_driver nct6687_driver = {
.driver = {
.name = DRVNAME,
@ -1172,6 +1179,7 @@ static struct platform_driver nct6687_driver = {
.suspend = nct6687_suspend,
.resume = nct6687_resume,
};
#pragma GCC diagnostic pop
static int __init nct6687_find(int sioaddr, struct nct6687_sio_data *sio_data)
{