libubox: update to latest version, fixes issues with using the library from C++ code

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

diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index 9a46689..837a7a9 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,7 @@ 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)
+  FILES:=$(LINUX_DIR)/drivers/net/sis190.ko

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


@@ -22,8 +22,9 @@ 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
+  FILES:=$(LINUX_DIR)/drivers/net/skge.ko

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


@@ -34,7 +35,7 @@ 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)
+  FILES:=$(LINUX_DIR)/drivers/net/atlx/atl2.ko

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


@@ -45,7 +46,7 @@ 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)
+  FILES:=$(LINUX_DIR)/drivers/net/atlx/atl1.ko

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


@@ -56,7 +57,7 @@ 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)
+  FILES:=$(LINUX_DIR)/drivers/net/atl1c/atl1c.ko

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


@@ -67,7 +68,7 @@ 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)
+  FILES:=$(LINUX_DIR)/drivers/net/atl1e/atl1e.ko

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


@@ -105,7 +106,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||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)


@@ -185,7 +186,6 @@ $(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
   FILES:=$(LINUX_DIR)/drivers/net/sky2.ko
   AUTOLOAD:=$(call AutoLoad,50,sky2)
   KCONFIG:=CONFIG_SKY2
   FILES:=$(LINUX_DIR)/drivers/net/sky2.ko
   AUTOLOAD:=$(call AutoLoad,50,sky2)


@@ -626,10 +626,12 @@ $(eval $(call KernelPackage,ifb))
 
 define KernelPackage/dm9000
   SUBMENU:=$(NETWORK_DEVICES_MENU)
 
 define KernelPackage/dm9000
   SUBMENU:=$(NETWORK_DEVICES_MENU)

-  TITLE:=Davicom 9000 Ethernet support (in-kernel)
-  KCONFIG:=CONFIG_DM9000=y \
+  TITLE:=Davicom 9000 Ethernet support
+  KCONFIG:=CONFIG_DM9000 \

     CONFIG_DM9000_DEBUGLEVEL=4 \
     CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y
     CONFIG_DM9000_DEBUGLEVEL=4 \
     CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL=y

+  FILES:=$(LINUX_DIR)/drivers/net/dm9000.ko
+  AUTOLOAD:=$(call AutoLoad,34,dm9000)

 endef
 
 define KernelPackage/dm9000/description
 endef
 
 define KernelPackage/dm9000/description