X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9fdbc2584272b13bb9671ae16e9545282ae52411..22e4a8566f390477188b6ea8c0c6ac31382c0a2e:/package/kernel/modules/w1.mk

diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk
index 0e7574259..1fa44e6d4 100644
--- a/package/kernel/modules/w1.mk
+++ b/package/kernel/modules/w1.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -24,9 +24,10 @@ endef
 
 $(eval $(call KernelPackage,w1))
 
-define w1dep
+
+define AddDepends/w1
   SUBMENU:=$(W1_MENU)
-  DEPENDS:=kmod-w1 $(1)
+  DEPENDS+=kmod-w1 $(1)
 endef
 
 
@@ -34,11 +35,12 @@ endef
 # 1-wire masters
 #
 define KernelPackage/w1-master-gpio
-  $(call w1dep,@GPIO_SUPPORT)
   TITLE:=GPIO 1-wire bus master driver
+  DEPENDS:=@GPIO_SUPPORT
   KCONFIG:=CONFIG_W1_MASTER_GPIO
   FILES:=$(W1_MASTERS_DIR)/w1-gpio.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,51,w1-gpio)
+  AUTOLOAD:=$(call AutoLoad,60,w1-gpio)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-master-gpio/description
@@ -51,13 +53,12 @@ $(eval $(call KernelPackage,w1-master-gpio))
 #
 # 1-wire slaves
 #
-ifeq (1,1)
 define KernelPackage/w1-slave-therm
-  $(call w1dep,)
   TITLE:=Thermal family implementation
   KCONFIG:=CONFIG_W1_SLAVE_THERM
   FILES:=$(W1_SLAVES_DIR)/w1_therm.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,52,w1_therm)
+  AUTOLOAD:=$(call AutoLoad,70,w1_therm)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-therm/description
@@ -68,11 +69,11 @@ $(eval $(call KernelPackage,w1-slave-therm))
 
 
 define KernelPackage/w1-slave-smem
-  $(call w1dep,)
   TITLE:=Simple 64bit memory family implementation
   KCONFIG:=CONFIG_W1_SLAVE_SMEM
   FILES:=$(W1_SLAVES_DIR)/w1_smem.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,52,w1_smem)
+  AUTOLOAD:=$(call AutoLoad,70,w1_smem)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-smem/description
@@ -81,14 +82,15 @@ endef
 
 $(eval $(call KernelPackage,w1-slave-smem))
 
+
 define KernelPackage/w1-slave-ds2433
-  $(call w1dep,)
   TITLE:=Simple 64bit memory family implementation
   KCONFIG:= \
 	CONFIG_W1_SLAVE_DS2433 \
 	CONFIG_W1_SLAVE_DS2433_CRC=n
   FILES:=$(W1_SLAVES_DIR)/w1_ds2433.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,52,w1_ds2433)
+  AUTOLOAD:=$(call AutoLoad,70,w1_ds2433)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-ds2433/description
@@ -99,13 +101,13 @@ $(eval $(call KernelPackage,w1-slave-ds2433))
 
 
 define KernelPackage/w1-slave-ds2760
-  $(call w1dep,)
   TITLE:=Dallas 2760 battery monitor chip (HP iPAQ & others)
   KCONFIG:= \
 	CONFIG_W1_SLAVE_DS2760 \
 	CONFIG_W1_SLAVE_DS2433_CRC=n
   FILES:=$(W1_SLAVES_DIR)/w1_ds2760.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,52,w1_ds2760)
+  AUTOLOAD:=$(call AutoLoad,70,w1_ds2760)
+  $(call AddDepends/w1)
 endef
 
 define KernelPackage/w1-slave-ds2760/description
@@ -113,4 +115,3 @@ define KernelPackage/w1-slave-ds2760/description
 endef
 
 $(eval $(call KernelPackage,w1-slave-ds2760))
-endif
\ No newline at end of file