X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7c27f09e8de114b578fc9dc529d40689869e270b..0432b2b9b938198359cb9e980a72358278f047bb:/target/linux/brcm63xx/modules.mk

diff --git a/target/linux/brcm63xx/modules.mk b/target/linux/brcm63xx/modules.mk
index e588fe962..2f09f4887 100644
--- a/target/linux/brcm63xx/modules.mk
+++ b/target/linux/brcm63xx/modules.mk
@@ -10,8 +10,13 @@ define KernelPackage/bcm63xx-spi
   TITLE:=Broadcom BCM63xx SPI driver
   DEPENDS:=@TARGET_brcm63xx +kmod-spi-bitbang
   KCONFIG:=CONFIG_SPI_BCM63XX
-  FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3)),1)
+    FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm63xx.ko
+    AUTOLOAD:=$(call AutoLoad,92,spi-bcm63xx)
+  else
+    FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.ko
+    AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi)
+  endif
 endef
 
 define KernelPackage/bcm63xx-spi/description
@@ -22,11 +27,11 @@ $(eval $(call KernelPackage,bcm63xx-spi))
 
 
 define KernelPackage/pcmcia-bcm63xx
-  SUBMENU:=$(OTHER_MENU)
+  SUBMENU:=$(PCMCIA_MENU)
   TITLE:=Broadcom BCM63xx PCMCIA support
-  DEPENDS:=@TARGET_brcm63xx kmod-pcmcia-core
+  DEPENDS:=@TARGET_brcm63xx +kmod-pcmcia-rsrc
   KCONFIG:=CONFIG_PCMCIA_BCM63XX
-  FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.ko
   AUTOLOAD:=$(call AutoLoad,41,bcm63xx_pcmcia)
 endef