[package] defer the loading of spidev after spi master drivers

[openwrt.git] / package / kernel / modules / netsupport.mk

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 6cea461..5b58aae 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -83,11 +83,9 @@ define KernelPackage/misdn
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=mISDN (ISDN) Support
   KCONFIG:= \
-       CONFIG_ISDN=y \
        CONFIG_MISDN \
        CONFIG_MISDN_DSP \
        CONFIG_MISDN_L1OIP \
-       CONFIG_ISDN_PPP=n \
        CONFIG_ISDN_AUDIO=n \
        CONFIG_ISDN_WITH_ABC=n \
        CONFIG_ISDN_DRV_LOOP=n \
@@ -107,6 +105,16 @@ define KernelPackage/misdn
   AUTOLOAD:=$(call AutoLoad,30,mISDN_core mISDN_dsp l1oip)
 endef
 
+define KernelPackage/misdn/2.4
+  KCONFIG+= \
+       CONFIG_ISDN
+endef
+
+define KernelPackage/misdn/2.6
+   KCONFIG+= \
+       CONFIG_ISDN=y
+endef
+
 define KernelPackage/misdn/description
   Modular ISDN driver support
 endef
@@ -146,7 +154,6 @@ define KernelPackage/isdn4linux/2.4
   KCONFIG+= \
        CONFIG_ISDN
   FILES+= \
-       $(LINUX_DIR)/drivers/isdn/isdn.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/isdn/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -438,6 +445,7 @@ define KernelPackage/pppoe
   FILES:= \
        $(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pppox pppoe)
 endef
 
 define KernelPackage/pppoe/description
@@ -462,6 +470,21 @@ endef
 
 $(eval $(call KernelPackage,pppoa))
 
+define KernelPackage/pppol2tp
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPPoL2TP support
+  DEPENDS:=kmod-ppp +kmod-pppoe @!LINUX_2_6_21||!LINUX_2_6_25
+  KCONFIG:=CONFIG_PPPOL2TP
+  FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
+endef
+
+define KernelPackage/pppol2tp/description
+  Kernel modules for PPPoL2TP (PPP over L2TP) support
+endef
+
+$(eval $(call KernelPackage,pppol2tp))
+
 
 define KernelPackage/ipoa
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -554,7 +577,7 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
-  DEPENDS:=kmod-crc16
+  DEPENDS:= +kmod-crc16
   KCONFIG:= \
        CONFIG_AX25 \
        CONFIG_MKISS