diff options
| -rw-r--r-- | package/kernel/modules/crypto.mk | 4 | ||||
| -rw-r--r-- | package/kernel/modules/i2c.mk | 10 | ||||
| -rw-r--r-- | package/kernel/modules/netdevices.mk | 159 | ||||
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 17 | ||||
| -rw-r--r-- | package/kernel/modules/other.mk | 5 | ||||
| -rw-r--r-- | package/kernel/modules/spi.mk | 18 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 2 | 
7 files changed, 46 insertions, 169 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index bb612fcf6..a148af122 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -376,14 +376,14 @@ define KernelPackage/crypto-misc  	$(LINUX_DIR)/crypto/twofish_common.ko \  	$(LINUX_DIR)/crypto/wp512.ko \      $(LINUX_DIR)/crypto/twofish_generic.ko -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,3.1)),1) +  ifdef CONFIG_LINUX_3_1      FILES += $(LINUX_DIR)/crypto/blowfish.ko    else      FILES += \  	$(LINUX_DIR)/crypto/blowfish_common.ko \  	$(LINUX_DIR)/crypto/blowfish_generic.ko    endif -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,3.2)),1) +  ifeq ($(CONFIG_LINUX_3_1)$(CONFIG_LINUX_3_2)),)      FILES += $(LINUX_DIR)/crypto/serpent.ko    else      FILES += $(LINUX_DIR)/crypto/serpent_generic.ko diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index d2b45d63d..50501cf4b 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -309,13 +309,8 @@ 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) @@ -329,13 +324,8 @@ 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/netdevices.mk b/package/kernel/modules/netdevices.mk index 400455f77..d8cd57c81 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -12,11 +12,7 @@ define KernelPackage/sis190    TITLE:=SiS 190 Fast/Gigabit Ethernet support    DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_SIS190 -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis190.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/sis190.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis190.ko    AUTOLOAD:=$(call AutoLoad,50,sis190)  endef @@ -29,11 +25,7 @@ define KernelPackage/skge    KCONFIG:=CONFIG_SKGE \  	CONFIG_SKGE_DEBUG=n \  	CONFIG_SKGE_GENESIS=n -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/skge.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/skge.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/skge.ko    AUTOLOAD:=$(call AutoLoad,50,skge)  endef @@ -42,13 +34,9 @@ $(eval $(call KernelPackage,skge))  define KernelPackage/atl2    SUBMENU:=$(NETWORK_DEVICES_MENU)    TITLE:=Atheros L2 Fast Ethernet support -  DEPENDS:=@PCI_SUPPORT +  DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_ATL2 -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl2.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/atlx/atl2.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl2.ko    AUTOLOAD:=$(call AutoLoad,50,atl2)  endef @@ -57,13 +45,9 @@ $(eval $(call KernelPackage,atl2))  define KernelPackage/atl1    SUBMENU:=$(NETWORK_DEVICES_MENU)    TITLE:=Atheros L1 Gigabit Ethernet support -  DEPENDS:=@PCI_SUPPORT +  DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_ATL1 -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl1.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/atlx/atl1.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atlx/atl1.ko    AUTOLOAD:=$(call AutoLoad,50,atl1)  endef @@ -72,13 +56,9 @@ $(eval $(call KernelPackage,atl1))  define KernelPackage/atl1c    SUBMENU:=$(NETWORK_DEVICES_MENU)    TITLE:=Atheros L1C -  DEPENDS:=@PCI_SUPPORT +  DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_ATL1C -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1c/atl1c.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/atl1c/atl1c.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1c/atl1c.ko    AUTOLOAD:=$(call AutoLoad,50,atl1c)  endef @@ -87,13 +67,9 @@ $(eval $(call KernelPackage,atl1c))  define KernelPackage/atl1e    SUBMENU:=$(NETWORK_DEVICES_MENU)    TITLE:=Atheros L1E -  DEPENDS:=@PCI_SUPPORT +  DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_ATL1E -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1e/atl1e.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/atl1e/atl1e.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/atheros/atl1e/atl1e.ko    AUTOLOAD:=$(call AutoLoad,50,atl1e)  endef @@ -211,11 +187,7 @@ define KernelPackage/natsemi    TITLE:=National Semiconductor DP8381x series    DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_NATSEMI -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/natsemi/natsemi.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/natsemi.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/natsemi/natsemi.ko    AUTOLOAD:=$(call AutoLoad,20,natsemi)  endef @@ -233,11 +205,7 @@ define KernelPackage/r6040    DEPENDS:=@TARGET_rdc +kmod-libphy    KCONFIG:=CONFIG_R6040 \  		CONFIG_R6040_NAPI=y -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/rdc/r6040.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/r6040.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/rdc/r6040.ko    AUTOLOAD:=$(call AutoLoad,99,r6040)  endef @@ -253,11 +221,7 @@ define KernelPackage/sis900    TITLE:=SiS 900 Ethernet support    DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_SIS900 -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis900.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/sis900.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis900.ko    AUTOLOAD:=$(call AutoLoad,50,sis900)  endef @@ -271,12 +235,9 @@ $(eval $(call KernelPackage,sis900))  define KernelPackage/sky2    SUBMENU:=$(NETWORK_DEVICES_MENU)    TITLE:=SysKonnect Yukon2 support +  DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_SKY2 -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/sky2.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/sky2.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/marvell/sky2.ko    AUTOLOAD:=$(call AutoLoad,50,sky2)  endef @@ -299,11 +260,7 @@ define KernelPackage/via-rhine    DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_VIA_RHINE \      CONFIG_VIA_RHINE_MMIO=y -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-rhine.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/via-rhine.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-rhine.ko    AUTOLOAD:=$(call AutoLoad,50,via-rhine)  endef @@ -319,11 +276,7 @@ define KernelPackage/via-velocity    TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support    DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||TARGET_x86 +kmod-lib-crc-ccitt    KCONFIG:=CONFIG_VIA_VELOCITY -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-velocity.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/via-velocity.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/via/via-velocity.ko    AUTOLOAD:=$(call AutoLoad,50,via-velocity)  endef @@ -338,11 +291,7 @@ define KernelPackage/ixp4xx-eth    TITLE:=IXP4xxt Ethernet Adapter kernel support    DEPENDS:=@TARGET_ixp4xx    KCONFIG:=CONFIG_IXP4XX_ETH -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/xscale/ixp4xx_eth.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/arm/ixp4xx_eth.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/xscale/ixp4xx_eth.ko    AUTOLOAD:=$(call AutoLoad,50,ixp4xx_eth)  endef @@ -361,11 +310,7 @@ define KernelPackage/8139too      CONFIG_8139TOO_TUNE_TWISTER=n \      CONFIG_8139TOO_8129=n \      CONFIG_8139_OLD_RX_RESET=n -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139too.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/8139too.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139too.ko    AUTOLOAD:=$(call AutoLoad,50,8139too)  endef @@ -381,11 +326,7 @@ define KernelPackage/8139cp    TITLE:=RealTek RTL-8139C+ PCI Fast Ethernet Adapter kernel support    DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_8139CP -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139cp.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/8139cp.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/8139cp.ko    AUTOLOAD:=$(call AutoLoad,50,8139cp)  endef @@ -403,7 +344,7 @@ define KernelPackage/r8169    KCONFIG:=CONFIG_R8169 \      CONFIG_R8169_NAPI=y \      CONFIG_R8169_VLAN=n -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko    else      FILES:=$(LINUX_DIR)/drivers/net/r8169.ko @@ -423,15 +364,9 @@ define KernelPackage/ne2k-pci    TITLE:=ne2k-pci Ethernet Adapter kernel support    DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_NE2K_PCI -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:= \ +  FILES:= \  	$(LINUX_DIR)/drivers/net/ethernet/8390/ne2k-pci.ko \  	$(LINUX_DIR)/drivers/net/ethernet/8390/8390.ko -  else -    FILES:= \ -	$(LINUX_DIR)/drivers/net/ne2k-pci.ko \ -	$(LINUX_DIR)/drivers/net/8390.ko -  endif    AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)  endef @@ -447,11 +382,7 @@ define KernelPackage/e100    TITLE:=Intel(R) PRO/100+ cards kernel support    DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_E100 -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e100.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/e100.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e100.ko    AUTOLOAD:=$(call AutoLoad,50,e100)  endef @@ -476,7 +407,7 @@ define KernelPackage/e1000    KCONFIG:=CONFIG_E1000 \      CONFIG_E1000_DISABLE_PACKET_SPLIT=n \      CONFIG_E1000_NAPI=y -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000/e1000.ko    else      FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.ko @@ -496,7 +427,7 @@ define KernelPackage/e1000e    TITLE:=Intel(R) PRO/1000 PCIe cards kernel support    DEPENDS:=@PCIE_SUPPORT    KCONFIG:=CONFIG_E1000E -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko    else      FILES:=$(LINUX_DIR)/drivers/net/e1000e/e1000e.ko @@ -516,11 +447,7 @@ define KernelPackage/b44    KCONFIG:=CONFIG_B44    DEPENDS:=@TARGET_x86 +kmod-ssb    SUBMENU:=$(NETWORK_DEVICES_MENU) -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/b44.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko    AUTOLOAD:=$(call AutoLoad,50,b44)  endef @@ -536,11 +463,7 @@ define KernelPackage/3c59x    TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang    DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_VORTEX -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/3com/3c59x.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/3c59x.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/3com/3c59x.ko    AUTOLOAD:=$(call AutoLoad,50,3c59x)  endef @@ -562,11 +485,7 @@ define KernelPackage/pcnet32    TITLE:=AMD PCnet32 PCI support    DEPENDS:=@(TARGET_x86||TARGET_malta)    KCONFIG:=CONFIG_PCNET32 -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/pcnet32.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/pcnet32.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/amd/pcnet32.ko    AUTOLOAD:=$(call AutoLoad,50,pcnet32)  endef @@ -582,7 +501,7 @@ define KernelPackage/tg3    KCONFIG:=CONFIG_TIGON3    DEPENDS:=+!TARGET_brcm47xx:kmod-libphy @!TARGET_ubicom32    SUBMENU:=$(NETWORK_DEVICES_MENU) -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko    else      FILES:=$(LINUX_DIR)/drivers/net/tg3.ko @@ -692,6 +611,7 @@ $(eval $(call KernelPackage,macvlan))  define KernelPackage/tulip    TITLE:=Tulip family network device support +  DEPENDS:=@TARGET_x86    SUBMENU:=$(NETWORK_DEVICES_MENU)    KCONFIG:= \      CONFIG_NET_TULIP=y \ @@ -706,23 +626,13 @@ define KernelPackage/tulip      CONFIG_WINBOND_840 \      CONFIG_DM9102 \      CONFIG_ULI526X  -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:= \ +  FILES:= \  	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/tulip.ko \  	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/de2104x.ko \  	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/de4x5.ko \  	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/dmfe.ko \  	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/uli526x.ko \  	$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/winbond-840.ko -  else -    FILES:= \ -	$(LINUX_DIR)/drivers/net/tulip/tulip.ko \ -	$(LINUX_DIR)/drivers/net/tulip/de2104x.ko \ -	$(LINUX_DIR)/drivers/net/tulip/de4x5.ko \ -	$(LINUX_DIR)/drivers/net/tulip/dmfe.ko \ -	$(LINUX_DIR)/drivers/net/tulip/uli526x.ko \ -	$(LINUX_DIR)/drivers/net/tulip/winbond-840.ko -  endif    AUTOLOAD:=$(call AutoLoad,50,tulip)  endef @@ -784,14 +694,11 @@ $(eval $(call KernelPackage,ifb))  define KernelPackage/dm9000    SUBMENU:=$(NETWORK_DEVICES_MENU)    TITLE:=Davicom 9000 Ethernet support +  DEPENDS:=@TARGET_x86    KCONFIG:=CONFIG_DM9000 \      CONFIG_DM9000_DEBUGLEVEL=4 \      CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) -    FILES:=$(LINUX_DIR)/drivers/net/ethernet/davicom/dm9000.ko -  else -    FILES:=$(LINUX_DIR)/drivers/net/dm9000.ko -  endif +  FILES:=$(LINUX_DIR)/drivers/net/ethernet/davicom/dm9000.ko    AUTOLOAD:=$(call AutoLoad,34,dm9000)  endef diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 8776b5282..656be4a0f 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -152,12 +152,7 @@ define KernelPackage/capi    FILES:= \  	$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.ko \  	$(LINUX_DIR)/drivers/isdn/capi/capi.ko - ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.0)),1)    AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi) - else -  FILES+= $(LINUX_DIR)/drivers/isdn/capi/capifs.ko -  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi) - endif  endef  define KernelPackage/capi/description @@ -472,7 +467,7 @@ define KernelPackage/ppp  	CONFIG_PPP \  	CONFIG_PPP_ASYNC \  	CONFIG_SLHC -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:= \  	$(LINUX_DIR)/drivers/net/ppp/ppp_async.ko \  	$(LINUX_DIR)/drivers/net/ppp/ppp_generic.ko \ @@ -498,7 +493,7 @@ define KernelPackage/ppp-synctty    TITLE:=PPP sync tty support    DEPENDS:=kmod-ppp    KCONFIG:=CONFIG_PPP_SYNC_TTY -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_synctty.ko    else      FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko @@ -518,7 +513,7 @@ define KernelPackage/pppoe    TITLE:=PPPoE support    DEPENDS:=kmod-ppp    KCONFIG:=CONFIG_PPPOE -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:= \  	$(LINUX_DIR)/drivers/net/ppp/pppoe.ko \  	$(LINUX_DIR)/drivers/net/ppp/pppox.ko @@ -558,7 +553,7 @@ define KernelPackage/pptp    TITLE:=PPtP support    DEPENDS:=kmod-ppp +kmod-gre    KCONFIG:=CONFIG_PPTP -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko    else      FILES:=$(LINUX_DIR)/drivers/net/pptp.ko @@ -608,7 +603,7 @@ define KernelPackage/mppe    KCONFIG:= \  	CONFIG_PPP_MPPE_MPPC \  	CONFIG_PPP_MPPE -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko    else      FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko @@ -858,7 +853,7 @@ define KernelPackage/slip         CONFIG_SLIP_SMART=y \         CONFIG_SLIP_MODE_SLIP6=y -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:= \         $(LINUX_DIR)/drivers/net/slip/slip.ko    else diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index be762533f..64246eebf 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -137,13 +137,8 @@ define KernelPackage/gpio-cs5535-new    TITLE:=AMD CS5535/CS5536 GPIO driver with improved sysfs support    DEPENDS:=@TARGET_x86 +kmod-cs5535-mfd    KCONFIG:=CONFIG_GPIO_CS5535 -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.1.0)),1)    FILES:=$(LINUX_DIR)/drivers/gpio/gpio-cs5535.ko    AUTOLOAD:=$(call AutoLoad,50,gpio-cs5535) -else -  FILES:=$(LINUX_DIR)/drivers/gpio/cs5535-gpio.ko -  AUTOLOAD:=$(call AutoLoad,50,cs5535-gpio) -endif  endef  define KernelPackage/gpio-cs5535-new/description diff --git a/package/kernel/modules/spi.mk b/package/kernel/modules/spi.mk index 0fac5a81e..fc7bce559 100644 --- a/package/kernel/modules/spi.mk +++ b/package/kernel/modules/spi.mk @@ -31,13 +31,8 @@ define KernelPackage/spi-bitbang    KCONFIG:=CONFIG_SPI_BITBANG \            CONFIG_SPI=y \            CONFIG_SPI_MASTER=y -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.1)),1) -    FILES:=$(LINUX_DIR)/drivers/spi/spi-bitbang.ko -    AUTOLOAD:=$(call AutoLoad,91,spi-bitbang) -  else -    FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.ko -    AUTOLOAD:=$(call AutoLoad,91,spi_bitbang) -  endif +  FILES:=$(LINUX_DIR)/drivers/spi/spi-bitbang.ko +  AUTOLOAD:=$(call AutoLoad,91,spi-bitbang)  endef  define KernelPackage/spi-bitbang/description @@ -67,13 +62,8 @@ 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)),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 +  FILES:=$(LINUX_DIR)/drivers/spi/spi-gpio.ko +  AUTOLOAD:=$(call AutoLoad,92,spi-gpio)  endef  define KernelPackage/spi-gpio/description diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 893d7b2a3..537149c36 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -16,7 +16,7 @@ define KernelPackage/usb-core    TITLE:=Support for USB    DEPENDS:=@USB_SUPPORT    KCONFIG:=CONFIG_USB CONFIG_XPS_USB_HCD_XILINX=n CONFIG_USB_FHCI_HCD=n -  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1) +  ifndef CONFIG_LINUX_3_1      FILES:= \  	$(LINUX_DIR)/drivers/usb/core/usbcore.ko \  	$(LINUX_DIR)/drivers/usb/usb-common.ko  | 
