From fe1f2bb1d957d199169580ca5b0c186ea2a66997 Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 3 Nov 2011 15:16:50 +0000 Subject: modules: fixes ko files that were renamed in 3.1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28724 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 10 ++++++++++ package/kernel/modules/spi.mk | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index eb3ac8357..0d525cc6d 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -293,8 +293,13 @@ endef $(eval $(call KernelPackage,i2c-mux-pca9541)) +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.1.0)),1) +GPIO_PCA953X_MODULES:= \ + CONFIG_GPIO_PCA953X:drivers/gpio/gpio-pca953x +else GPIO_PCA953X_MODULES:= \ CONFIG_GPIO_PCA953X:drivers/gpio/pca953x +endif define KernelPackage/pca953x $(call i2c_defaults,$(GPIO_PCA953X_MODULES),51) @@ -308,8 +313,13 @@ endef $(eval $(call KernelPackage,pca953x)) +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.1.0)),1) +GPIO_PCF857X_MODULES:= \ + CONFIG_GPIO_PCF857X:drivers/gpio/gpio-pcf857x +else GPIO_PCF857X_MODULES:= \ CONFIG_GPIO_PCF857X:drivers/gpio/pcf857x +endif define KernelPackage/pcf857x $(call i2c_defaults,$(GPIO_PCF857X_MODULES),51) diff --git a/package/kernel/modules/spi.mk b/package/kernel/modules/spi.mk index 7cb2a354d..0c187b3a2 100644 --- a/package/kernel/modules/spi.mk +++ b/package/kernel/modules/spi.mk @@ -62,8 +62,13 @@ define KernelPackage/spi-gpio TITLE:=GPIO-based bitbanging SPI Master DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang KCONFIG:=CONFIG_SPI_GPIO +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.1.0)),1) + FILES:=$(LINUX_DIR)/drivers/spi/spi-gpio.ko + AUTOLOAD:=$(call AutoLoad,92,spi-gpio) +else FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.ko AUTOLOAD:=$(call AutoLoad,92,spi_gpio) +endif endef define KernelPackage/spi-gpio/description -- cgit v1.2.3