[package] kernel: fix leds-net48xx and scx200-gpio dependencies, closes #4486

[openwrt/svn-archive/archive.git] / package / kernel / modules / other.mk

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 838526939f787ce47178a052c03eee6614b6bc77..fb5c241480df80a2a68580d44c109a6a43a6003b 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -105,7 +105,7 @@ define KernelPackage/pcmcia-core/2.4
 #      CONFIG_CARDBUS
   FILES:= \
        $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,40,pcmcia_core ds)
 endef
 
@@ -199,11 +199,13 @@ define KernelPackage/ssb
   KCONFIG:=\
        CONFIG_SSB \
        CONFIG_SSB_B43_PCI_BRIDGE=y \
-       CONFIG_SSB_DRIVER_PCICORE_POSSIBLE \
+       CONFIG_SSB_DRIVER_PCICORE=y \
+       CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y \
        CONFIG_SSB_PCIHOST=y \
-       CONFIG_SSB_PCIHOST_POSSIBLE \
-       CONFIG_SSB_POSSIBLE \
-       CONFIG_SSB_SPROM
+       CONFIG_SSB_PCIHOST_POSSIBLE=y \
+       CONFIG_SSB_POSSIBLE=y \
+       CONFIG_SSB_SPROM=y \
+       CONFIG_SSB_SILENT=y
   FILES:=$(LINUX_DIR)/drivers/ssb/ssb.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,29,ssb)
 endef
@@ -218,7 +220,7 @@ $(eval $(call KernelPackage,ssb))
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
   KCONFIG:= \
        CONFIG_BLUEZ \
        CONFIG_BLUEZ_L2CAP \
@@ -402,7 +404,7 @@ $(eval $(call KernelPackage,ledtrig-adm5120-switch))
 define KernelPackage/leds-net48xx
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Soekris Net48xx LED support
-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@TARGET_x86 +kmod-scx200-gpio
   KCONFIG:=CONFIG_LEDS_NET48XX
   FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
@@ -512,7 +514,7 @@ $(eval $(call KernelPackage,nsc-gpio))
 define KernelPackage/scx200-gpio
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Natsemi SCX200 GPIO support
-  DEPENDS:=@TARGET_x86 kmod-nsc-gpio
+  DEPENDS:=@TARGET_x86 +kmod-nsc-gpio
   KCONFIG:=CONFIG_SCx200_GPIO
   FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
@@ -719,3 +721,18 @@ define KernelPackage/spi-dev/description
 endef
 
 $(eval $(call KernelPackage,spi-dev))
+
+define KernelPackage/cs5535-gpio
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=AMD CS5535/CS5536 GPIO driver
+  DEPENDS:=@TARGET_x86||@TARGET_olpc
+  KCONFIG:=CONFIG_CS5535_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,cs5535_gpio)
+endef
+
+define KernelPackage/cs5535-gpio/description
+ This package contains the AMD CS5535/CS5536 GPIO driver
+endef
+
+$(eval $(call KernelPackage,cs5535-gpio))