[openwrt/openwrt] ramips: rename pwm kernel module

LEDE Commits lede-commits at lists.infradead.org
Sun Apr 8 13:03:31 PDT 2018


mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/dda5d9b78643ca2a943759278c2ef50d595cb509

commit dda5d9b78643ca2a943759278c2ef50d595cb509
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Sun Apr 8 11:49:02 2018 +0200

    ramips: rename pwm kernel module
    
    With kernel 4.14 the OpenWrt specific module name collides with the
    upstream added module for Mediatek ARM Socs.
    
    During addition of preliminary support for kernel 4.14, the config
    symbol used by the out of tree driver was already renamed but the ramips
    kernel package wasn't updated.
    
    Fix the build error by updating the config and kernel module name for
    the kernel package.
    
    Signed-off-by: Mathias Kresin <dev at kresin.me>
---
 target/linux/ramips/modules.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/linux/ramips/modules.mk b/target/linux/ramips/modules.mk
index 95dfd78..88e83a4 100644
--- a/target/linux/ramips/modules.mk
+++ b/target/linux/ramips/modules.mk
@@ -7,24 +7,24 @@
 
 OTHER_MENU:=Other modules
 
-define KernelPackage/pwm-mediatek
+define KernelPackage/pwm-mediatek-ramips
   SUBMENU:=Other modules
   TITLE:=MT7628 PWM
   DEPENDS:=@(TARGET_ramips_mt76x8)
   KCONFIG:= \
 	CONFIG_PWM=y \
-	CONFIG_PWM_MEDIATEK \
+	CONFIG_PWM_MEDIATEK_RAMIPS \
 	CONFIG_PWM_SYSFS=y
   FILES:= \
-	$(LINUX_DIR)/drivers/pwm/pwm-mediatek.ko
-  AUTOLOAD:=$(call AutoProbe,pwm-mediatek)
+	$(LINUX_DIR)/drivers/pwm/pwm-mediatek-ramips.ko
+  AUTOLOAD:=$(call AutoProbe,pwm-mediatek-ramips)
 endef
 
 define KernelPackage/pwm-mediatek/description
   Kernel modules for MediaTek Pulse Width Modulator
 endef
 
-$(eval $(call KernelPackage,pwm-mediatek))
+$(eval $(call KernelPackage,pwm-mediatek-ramips))
 
 define KernelPackage/sdhci-mt7620
   SUBMENU:=Other modules



More information about the lede-commits mailing list