[package] uci: update to latest git rev 7289b2d69aaffa9299b47aaaa0da1e9969ace6c1

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

diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index 2cbc3c1..400436c 100644 (file)
--- a/package/kernel/modules/netdevices.mk
+++ b/package/kernel/modules/netdevices.mk
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -12,7 +12,11 @@ define KernelPackage/sis190
   TITLE:=SiS 190 Fast/Gigabit Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS190
   TITLE:=SiS 190 Fast/Gigabit Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_SIS190

-  FILES:=$(LINUX_DIR)/drivers/net/sis190.$(LINUX_KMOD_SUFFIX)
+  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
  
   AUTOLOAD:=$(call AutoLoad,50,sis190)
 endef
  


@@ -22,8 +26,13 @@ define KernelPackage/skge
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SysKonnect Yukon support
   DEPENDS:=@TARGET_x86
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SysKonnect Yukon support
   DEPENDS:=@TARGET_x86

-  KCONFIG:=CONFIG_SKGE
-  FILES:=$(LINUX_DIR)/drivers/net/skge.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_SKGE \
+    CONFIG_SKGE_DEBUG=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

   AUTOLOAD:=$(call AutoLoad,50,skge)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,skge)
 endef
 


@@ -34,7 +43,11 @@ define KernelPackage/atl2
   TITLE:=Atheros L2 Fast Ethernet support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL2
   TITLE:=Atheros L2 Fast Ethernet support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL2

-  FILES:=$(LINUX_DIR)/drivers/net/atlx/atl2.$(LINUX_KMOD_SUFFIX)
+  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
 
   AUTOLOAD:=$(call AutoLoad,50,atl2)
 endef
 


@@ -45,7 +58,11 @@ define KernelPackage/atl1
   TITLE:=Atheros L1 Gigabit Ethernet support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1
   TITLE:=Atheros L1 Gigabit Ethernet support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1

-  FILES:=$(LINUX_DIR)/drivers/net/atlx/atl1.$(LINUX_KMOD_SUFFIX)
+  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
 
   AUTOLOAD:=$(call AutoLoad,50,atl1)
 endef
 


@@ -56,7 +73,11 @@ define KernelPackage/atl1c
   TITLE:=Atheros L1C
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1C
   TITLE:=Atheros L1C
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1C

-  FILES:=$(LINUX_DIR)/drivers/net/atl1c/atl1c.$(LINUX_KMOD_SUFFIX)
+  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
 
   AUTOLOAD:=$(call AutoLoad,50,atl1c)
 endef
 


@@ -67,7 +88,11 @@ define KernelPackage/atl1e
   TITLE:=Atheros L1E
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1E
   TITLE:=Atheros L1E
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_ATL1E

-  FILES:=$(LINUX_DIR)/drivers/net/atl1e/atl1e.$(LINUX_KMOD_SUFFIX)
+  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
 
   AUTOLOAD:=$(call AutoLoad,50,atl1e)
 endef
 


@@ -105,7 +130,7 @@ $(eval $(call KernelPackage,swconfig))
 define KernelPackage/mvswitch
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Marvell 88E6060 switch support
 define KernelPackage/mvswitch
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Marvell 88E6060 switch support

-  DEPENDS:=+kmod-swconfig
+  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)
   KCONFIG:=CONFIG_MVSWITCH_PHY
   FILES:=$(LINUX_DIR)/drivers/net/phy/mvswitch.ko
   AUTOLOAD:=$(call AutoLoad,41,mvswitch)


@@ -137,7 +162,11 @@ define KernelPackage/natsemi
   TITLE:=National Semiconductor DP8381x series
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_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
 
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef
 


@@ -155,7 +184,11 @@ define KernelPackage/r6040
   DEPENDS:=@TARGET_rdc
   KCONFIG:=CONFIG_R6040 \
                CONFIG_R6040_NAPI=y
   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
 
   AUTOLOAD:=$(call AutoLoad,99,r6040)
 endef
 


@@ -171,7 +204,11 @@ define KernelPackage/sis900
   TITLE:=SiS 900 Ethernet support
   DEPENDS:=@TARGET_x86
   KCONFIG:=CONFIG_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
 
   AUTOLOAD:=$(call AutoLoad,50,sis900)
 endef
 


@@ -185,9 +222,12 @@ $(eval $(call KernelPackage,sis900))
 define KernelPackage/sky2
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SysKonnect Yukon2 support
 define KernelPackage/sky2
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=SysKonnect Yukon2 support

-  DEPENDS:=@TARGET_x86

   KCONFIG:=CONFIG_SKY2
   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
 
   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
   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
 
   AUTOLOAD:=$(call AutoLoad,50,via-rhine)
 endef
 


@@ -224,9 +268,13 @@ $(eval $(call KernelPackage,via-rhine))
 define KernelPackage/via-velocity
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
 define KernelPackage/via-velocity
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support

-  DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||TARGET_x86 +kmod-crc-ccitt
+  DEPENDS:=@TARGET_ixp4xx||TARGET_mpc83xx||TARGET_x86 +kmod-lib-crc-ccitt

   KCONFIG:=CONFIG_VIA_VELOCITY
   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
 
   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
   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
 
   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
     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
 
   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
   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
 
   AUTOLOAD:=$(call AutoLoad,50,8139cp)
 endef
 


@@ -294,7 +354,11 @@ define KernelPackage/r8169
   KCONFIG:=CONFIG_R8169 \
     CONFIG_R8169_NAPI=y \
     CONFIG_R8169_VLAN=n
   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
 
   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
   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
        $(LINUX_DIR)/drivers/net/ne2k-pci.ko \
        $(LINUX_DIR)/drivers/net/8390.ko

+  endif

   AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
 endef
 
   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
   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
 
   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
   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
 
   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
   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
 
   AUTOLOAD:=$(call AutoLoad,50,e1000e)
 endef
 


@@ -382,10 +464,14 @@ $(eval $(call KernelPackage,e1000e))
 
 define KernelPackage/b44
   TITLE:=Broadcom 44xx driver
 
 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)
   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
 
   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
   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
 
   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
   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
 
   AUTOLOAD:=$(call AutoLoad,50,pcnet32)
 endef
 


@@ -436,10 +530,14 @@ $(eval $(call KernelPackage,pcnet32))
 
 define KernelPackage/tg3
   TITLE:=Broadcom Tigon3 Gigabit Ethernet
 
 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)
   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
 
   AUTOLOAD:=$(call AutoLoad,50,tg3)
 endef
 


@@ -501,7 +599,7 @@ $(eval $(call KernelPackage,hfcmulti))
 define KernelPackage/gigaset
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Siemens Gigaset support for isdn4linux
 define KernelPackage/gigaset
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=Siemens Gigaset support for isdn4linux

-  DEPENDS:=@USB_SUPPORT +kmod-isdn4linux +kmod-crc-ccitt +kmod-usb-core
+  DEPENDS:=@USB_SUPPORT +kmod-isdn4linux +kmod-lib-crc-ccitt +kmod-usb-core

   URL:=http://gigaset307x.sourceforge.net/
   KCONFIG:= \
     CONFIG_ISDN_DRV_GIGASET \
   URL:=http://gigaset307x.sourceforge.net/
   KCONFIG:= \
     CONFIG_ISDN_DRV_GIGASET \


@@ -559,13 +657,23 @@ define KernelPackage/tulip
     CONFIG_WINBOND_840 \
     CONFIG_DM9102 \
     CONFIG_ULI526X 
     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
 
   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
   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
 
   AUTOLOAD:=$(call AutoLoad,34,dm9000)
 endef