From 980932bf592e7f62000efc328c86c7d9f69c6dc1 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 24 Oct 2012 13:04:57 +0000 Subject: [PATCH] [package] i2c muxes modules have a different prefix since 3.5 Kernel 3.5 started prefixing i2c muxes modules with i2c-mux-, account for that git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33904 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index d0ebfccfc..6c6598968 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -212,8 +212,12 @@ endef $(eval $(call KernelPackage,i2c-mux-gpio)) +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1) +I2C_MUX_PREFIX:=i2c-mux- +endif + I2C_MUX_PCA954x_MODULES:= \ - CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/pca954x + CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca954x define KernelPackage/i2c-mux-pca954x $(call i2c_defaults,$(I2C_MUX_PCA954x_MODULES),51) @@ -229,7 +233,7 @@ $(eval $(call KernelPackage,i2c-mux-pca954x)) ## Support for pca954x seems to be in kernel since 2.6.36 I2C_MUX_PCA9541_MODULES:= \ - CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/pca9541 + CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca9541 define KernelPackage/i2c-mux-pca9541 $(call i2c_defaults,$(I2C_MUX_PCA9541_MODULES),51)