From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 13 Dec 2012 00:09:55 +0000 (+0000)
Subject: kernel: in kernel 3.6.8 and later tg3 depends on hwmon.ko
X-Git-Tag: reboot~11996
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3a4a6cfd64c014098b35f3b5c7895fa3dc92f78c;p=oweals%2Fopenwrt.git

kernel: in kernel 3.6.8 and later tg3 depends on hwmon.ko

SVN-Revision: 34652
---

diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index c539ea5001..bab3d70947 100644
--- a/package/kernel/modules/netdevices.mk
+++ b/package/kernel/modules/netdevices.mk
@@ -473,7 +473,7 @@ $(eval $(call KernelPackage,pcnet32))
 define KernelPackage/tg3
   TITLE:=Broadcom Tigon3 Gigabit Ethernet
   KCONFIG:=CONFIG_TIGON3
-  DEPENDS:=+!TARGET_brcm47xx:kmod-libphy
+  DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
   AUTOLOAD:=$(call AutoLoad,50,tg3)
diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
index 038a415a62..e7e7d54082 100644
--- a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
+++ b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm
@@ -26,6 +26,7 @@ check_module () {
 }
 
 init_iface() {
+	check_module hwmon
 	check_module tg3
 	insmod switch-core
 	check_module switch-robo || check_module switch-adm  || {