package: kernel: add handling for 3.2 renames (and some missed ones for 3.1)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28897 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 198 insertions, 50 deletions

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 5f542d11b3..8612c34fa8 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -64,7 +64,7 @@ $(eval $(call KernelPackage,crypto-manager))
 
 define KernelPackage/crypto-user
   TITLE:=CryptoAPI userspace interface
-  DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager @LINUX_2_6_38||LINUX_2_6_39||LINUX_3_0
+  DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager @!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_31&&!LINUX_2_6_36&&!LINUX_2_6_37
   KCONFIG:= \
 	CONFIG_CRYPTO_USER_API \
 	CONFIG_CRYPTO_USER_API_HASH \
@@ -364,7 +364,6 @@ define KernelPackage/crypto-misc
 	CONFIG_CRYPTO_WP512
   FILES:= \
 	$(LINUX_DIR)/crypto/anubis.ko \
-	$(LINUX_DIR)/crypto/blowfish.ko \
 	$(LINUX_DIR)/crypto/camellia.ko \
 	$(LINUX_DIR)/crypto/cast5.ko \
 	$(LINUX_DIR)/crypto/cast6.ko \
@@ -382,6 +381,12 @@ define KernelPackage/crypto-misc
   else
     FILES += $(LINUX_DIR)/crypto/twofish_generic.ko
   endif
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),le,3.1)),1)
+    FILES += $(LINUX_DIR)/crypto/blowfish.ko
+  else
+    FILES += $(LINUX_DIR)/crypto/blowfish_common.ko \
+    FILES += $(LINUX_DIR)/crypto/blowfish_generic.ko
+  endif
   $(call AddDepends/crypto)
 endef
 
@@ -395,7 +400,7 @@ $(eval $(call KernelPackage,crypto-misc))
 
 define KernelPackage/crypto-ocf
   TITLE:=OCF modules
-  DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml +kmod-crypto-manager
+  DEPENDS:=+@OPENSSL_ENGINE @!TARGET_uml +kmod-crypto-manager @!LINUX_3_2||BROKEN
   KCONFIG:= \
 	CONFIG_OCF_OCF \
 	CONFIG_OCF_CRYPTODEV \
diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index a10b8fe8d7..400436cadc 100644
--- a/package/kernel/modules/netdevices.mk
+++ b/package/kernel/modules/netdevices.mk
@@ -12,7 +12,11 @@ define KernelPackage/sis190
   TITLE:=SiS 190 Fast/Gigabit Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS190
-  FILES:=$(LINUX_DIR)/drivers/net/sis190.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,sis190)
 endef
  
@@ -24,7 +28,11 @@ define KernelPackage/skge
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SKGE \
     CONFIG_SKGE_DEBUG=n
-  FILES:=$(LINUX_DIR)/drivers/net/skge.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,skge)
 endef
 
@@ -35,7 +43,11 @@ define KernelPackage/atl2
   TITLE:=Atheros L2 Fast Ethernet support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL2
-  FILES:=$(LINUX_DIR)/drivers/net/atlx/atl2.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,atl2)
 endef
 
@@ -46,7 +58,11 @@ define KernelPackage/atl1
   TITLE:=Atheros L1 Gigabit Ethernet support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1
-  FILES:=$(LINUX_DIR)/drivers/net/atlx/atl1.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,atl1)
 endef
 
@@ -57,7 +73,11 @@ define KernelPackage/atl1c
   TITLE:=Atheros L1C
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1C
-  FILES:=$(LINUX_DIR)/drivers/net/atl1c/atl1c.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,atl1c)
 endef
 
@@ -68,7 +88,11 @@ define KernelPackage/atl1e
   TITLE:=Atheros L1E
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1E
-  FILES:=$(LINUX_DIR)/drivers/net/atl1e/atl1e.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,atl1e)
 endef
 
@@ -106,7 +130,7 @@ $(eval $(call KernelPackage,swconfig))
 define KernelPackage/mvswitch
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Marvell 88E6060 switch support
-  DEPENDS:=+kmod-swconfig @!LINUX_3_1||BROKEN
+  DEPENDS:=+kmod-swconfig @!LINUX_3_1&&!LINUX_3_2||BROKEN
   KCONFIG:=CONFIG_MVSWITCH_PHY
   FILES:=$(LINUX_DIR)/drivers/net/phy/mvswitch.ko
   AUTOLOAD:=$(call AutoLoad,41,mvswitch)
@@ -138,7 +162,11 @@ define KernelPackage/natsemi
   TITLE:=National Semiconductor DP8381x series
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NATSEMI
-  FILES:=$(LINUX_DIR)/drivers/net/natsemi.ko
+  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
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef
 
@@ -156,7 +184,11 @@ define KernelPackage/r6040
   DEPENDS:=@TARGET_rdc
   KCONFIG:=CONFIG_R6040 \
 		CONFIG_R6040_NAPI=y
-  FILES:=$(LINUX_DIR)/drivers/net/r6040.ko
+  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
   AUTOLOAD:=$(call AutoLoad,99,r6040)
 endef
 
@@ -172,7 +204,11 @@ define KernelPackage/sis900
   TITLE:=SiS 900 Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS900
-  FILES:=$(LINUX_DIR)/drivers/net/sis900.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,sis900)
 endef
 
@@ -187,7 +223,11 @@ define KernelPackage/sky2
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SysKonnect Yukon2 support
   KCONFIG:=CONFIG_SKY2
-  FILES:=$(LINUX_DIR)/drivers/net/sky2.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,sky2)
 endef
 
@@ -210,7 +250,11 @@ define KernelPackage/via-rhine
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_VIA_RHINE \
     CONFIG_VIA_RHINE_MMIO=y
-  FILES:=$(LINUX_DIR)/drivers/net/via-rhine.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,via-rhine)
 endef
 
@@ -226,7 +270,11 @@ 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
-  FILES:=$(LINUX_DIR)/drivers/net/via-velocity.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,via-velocity)
 endef
 
@@ -241,7 +289,11 @@ define KernelPackage/ixp4xx-eth
   TITLE:=IXP4xxt Ethernet Adapter kernel support
   DEPENDS:=@TARGET_ixp4xx
   KCONFIG:=CONFIG_IXP4XX_ETH
-  FILES:=$(LINUX_DIR)/drivers/net/arm/ixp4xx_eth.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,ixp4xx_eth)
 endef
 
@@ -260,7 +312,11 @@ define KernelPackage/8139too
     CONFIG_8139TOO_TUNE_TWISTER=n \
     CONFIG_8139TOO_8129=n \
     CONFIG_8139_OLD_RX_RESET=n
-  FILES:=$(LINUX_DIR)/drivers/net/8139too.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,8139too)
 endef
 
@@ -276,7 +332,11 @@ define KernelPackage/8139cp
   TITLE:=RealTek RTL-8139C+ PCI Fast Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_8139CP
-  FILES:=$(LINUX_DIR)/drivers/net/8139cp.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,8139cp)
 endef
 
@@ -294,7 +354,11 @@ define KernelPackage/r8169
   KCONFIG:=CONFIG_R8169 \
     CONFIG_R8169_NAPI=y \
     CONFIG_R8169_VLAN=n
-  FILES:=$(LINUX_DIR)/drivers/net/r8169.ko
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/r8169.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,50,r8169)
 endef
 
@@ -310,9 +374,15 @@ define KernelPackage/ne2k-pci
   TITLE:=ne2k-pci Ethernet Adapter kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_NE2K_PCI
-  FILES:= \
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    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
 
@@ -328,7 +398,11 @@ define KernelPackage/e100
   TITLE:=Intel(R) PRO/100+ cards kernel support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_E100
-  FILES:=$(LINUX_DIR)/drivers/net/e100.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,e100)
 endef
 
@@ -353,7 +427,11 @@ define KernelPackage/e1000
   KCONFIG:=CONFIG_E1000 \
     CONFIG_E1000_DISABLE_PACKET_SPLIT=n \
     CONFIG_E1000_NAPI=y
-  FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.ko
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000/e1000.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,35,e1000)
 endef
 
@@ -369,7 +447,11 @@ define KernelPackage/e1000e
   TITLE:=Intel(R) PRO/1000 PCIe cards kernel support
   DEPENDS:=@PCIE_SUPPORT
   KCONFIG:=CONFIG_E1000E
-  FILES:=$(LINUX_DIR)/drivers/net/e1000e/e1000e.ko
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/intel/e1000e/e1000e.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/e1000e/e1000e.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,50,e1000e)
 endef
 
@@ -382,10 +464,14 @@ $(eval $(call KernelPackage,e1000e))
 
 define KernelPackage/b44
   TITLE:=Broadcom 44xx driver
-  FILES:=$(LINUX_DIR)/drivers/net/b44.ko
   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
   AUTOLOAD:=$(call AutoLoad,50,b44)
 endef
 
@@ -401,7 +487,11 @@ define KernelPackage/3c59x
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_VORTEX
-  FILES:=$(LINUX_DIR)/drivers/net/3c59x.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,3c59x)
 endef
 
@@ -423,7 +513,11 @@ define KernelPackage/pcnet32
   TITLE:=AMD PCnet32 PCI support
   DEPENDS:=@(TARGET_x86||TARGET_malta)
   KCONFIG:=CONFIG_PCNET32
-  FILES:=$(LINUX_DIR)/drivers/net/pcnet32.ko
+  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
   AUTOLOAD:=$(call AutoLoad,50,pcnet32)
 endef
 
@@ -436,10 +530,14 @@ $(eval $(call KernelPackage,pcnet32))
 
 define KernelPackage/tg3
   TITLE:=Broadcom Tigon3 Gigabit Ethernet
-  FILES:=$(LINUX_DIR)/drivers/net/tg3.ko
   KCONFIG:=CONFIG_TIGON3
   DEPENDS:=+!TARGET_brcm47xx:kmod-libphy @!TARGET_ubicom32
   SUBMENU:=$(NETWORK_DEVICES_MENU)
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/tg3.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,50,tg3)
 endef
 
@@ -559,13 +657,23 @@ define KernelPackage/tulip
     CONFIG_WINBOND_840 \
     CONFIG_DM9102 \
     CONFIG_ULI526X 
-  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
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    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
 
@@ -630,7 +738,11 @@ define KernelPackage/dm9000
   KCONFIG:=CONFIG_DM9000 \
     CONFIG_DM9000_DEBUGLEVEL=4 \
     CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y
-  FILES:=$(LINUX_DIR)/drivers/net/dm9000.ko
+  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
   AUTOLOAD:=$(call AutoLoad,34,dm9000)
 endef
 
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 4f04627b5e..0a44a5dc7f 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -415,10 +415,17 @@ define KernelPackage/ppp
 	CONFIG_PPP \
 	CONFIG_PPP_ASYNC \
 	CONFIG_SLHC
-  FILES:= \
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:= \
+	$(LINUX_DIR)/drivers/net/ppp/ppp_async.ko \
+	$(LINUX_DIR)/drivers/net/ppp/ppp_generic.ko \
+	$(LINUX_DIR)/drivers/net/slip/slhc.ko
+  else
+    FILES:= \
 	$(LINUX_DIR)/drivers/net/ppp_async.ko \
 	$(LINUX_DIR)/drivers/net/ppp_generic.ko \
 	$(LINUX_DIR)/drivers/net/slhc.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
 endef
 
@@ -434,7 +441,11 @@ define KernelPackage/ppp-synctty
   TITLE:=PPP sync tty support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPP_SYNC_TTY
-  FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_synctty.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/ppp_synctty.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,40,ppp_synctty)
 endef
 
@@ -450,9 +461,15 @@ define KernelPackage/pppoe
   TITLE:=PPPoE support
   DEPENDS:=kmod-ppp
   KCONFIG:=CONFIG_PPPOE
-  FILES:= \
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:= \
+	$(LINUX_DIR)/drivers/net/ppp/pppoe.ko \
+	$(LINUX_DIR)/drivers/net/ppp/pppox.ko
+  else
+    FILES:= \
 	$(LINUX_DIR)/drivers/net/pppoe.ko \
 	$(LINUX_DIR)/drivers/net/pppox.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,40,pppox pppoe)
 endef
 
@@ -484,7 +501,11 @@ define KernelPackage/pptp
   TITLE:=PPtP support
   DEPENDS:=kmod-ppp +kmod-gre @!LINUX_2_6_30&&!LINUX_2_6_31&&!LINUX_2_6_32&&!LINUX_2_6_36
   KCONFIG:=CONFIG_PPTP
-  FILES:=$(LINUX_DIR)/drivers/net/pptp.ko
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ppp/pptp.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/pptp.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,41,pptp)
 endef
 
@@ -535,7 +556,11 @@ define KernelPackage/mppe
   KCONFIG:= \
 	CONFIG_PPP_MPPE_MPPC \
 	CONFIG_PPP_MPPE
-  FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko
+  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.2)),1)
+    FILES:=$(LINUX_DIR)/drivers/net/ppp/ppp_mppe.ko
+  else
+    FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.ko
+  endif
   AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef
 
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 951f7ac944..266aa01cb8 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -560,6 +560,7 @@ define KernelPackage/bcma
 	CONFIG_BCMA_BLOCKIO=y \
 	CONFIG_BCMA_HOST_PCI_POSSIBLE=y \
 	CONFIG_BCMA_HOST_PCI=y \
+	CONFIG_BCMA_DRIVER_MIPS=n \
 	CONFIG_BCMA_DRIVER_PCI_HOSTMODE=n \
 	CONFIG_BCMA_DEBUG=n
   FILES:=$(LINUX_DIR)/drivers/bcma/bcma.ko
diff --git a/package/kernel/modules/spi.mk b/package/kernel/modules/spi.mk
index 0c187b3a2f..ff24d9f663 100644
--- a/package/kernel/modules/spi.mk
+++ b/package/kernel/modules/spi.mk
@@ -31,8 +31,13 @@ define KernelPackage/spi-bitbang
   KCONFIG:=CONFIG_SPI_BITBANG \
           CONFIG_SPI=y \
           CONFIG_SPI_MASTER=y
-  FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.ko
-  AUTOLOAD:=$(call AutoLoad,91,spi_bitbang)
+  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
 endef
 
 define KernelPackage/spi-bitbang/description
@@ -62,13 +67,13 @@ 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.0)),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
+  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
 endef
 
 define KernelPackage/spi-gpio/description