[openwrt/openwrt] kernel: modules: hwmon: adapt for kernel 6.6

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 11 12:18:02 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/faf3d80bf1751e457af73fa22f2d2f3517f2d93f

commit faf3d80bf1751e457af73fa22f2d2f3517f2d93f
Author: Tan Zien <nabsdh9 at gmail.com>
AuthorDate: Mon Mar 4 00:57:03 2024 +0800

    kernel: modules: hwmon: adapt for kernel 6.6
    
    Adapt hwmon kmods for building under kernel 6.6:
    * ad7418 now requires regmap
    * Invert criteria to allow adt7410 be built with Linux 6.1 as well
      as Linux 6.6.
    
    Signed-off-by: Tan Zien <nabsdh9 at gmail.com>
---
 package/kernel/linux/modules/hwmon.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index 8afe315344..0d105dcc9e 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -34,7 +34,7 @@ define KernelPackage/hwmon-ad7418
   KCONFIG:=CONFIG_SENSORS_AD7418
   FILES:=$(LINUX_DIR)/drivers/hwmon/ad7418.ko
   AUTOLOAD:=$(call AutoLoad,60,ad7418 ad7418)
-  $(call AddDepends/hwmon,+kmod-i2c-core)
+  $(call AddDepends/hwmon,+kmod-i2c-core +LINUX_6_6:kmod-regmap-core)
 endef
 
 define KernelPackage/hwmon-ad7418/description
@@ -52,7 +52,7 @@ define KernelPackage/hwmon-adt7410
 	$(LINUX_DIR)/drivers/hwmon/adt7x10.ko \
 	$(LINUX_DIR)/drivers/hwmon/adt7410.ko
   AUTOLOAD:=$(call AutoLoad,60,adt7x10 adt7410)
-  $(call AddDepends/hwmon,+kmod-i2c-core +LINUX_6_1:kmod-regmap-core)
+  $(call AddDepends/hwmon,+kmod-i2c-core +!LINUX_5_15:kmod-regmap-core)
 endef
 
 define KernelPackage/hwmon-adt7410/description




More information about the lede-commits mailing list