diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-12-13 00:09:55 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-12-13 00:09:55 +0000 |
| commit | e26a7dcc11c9be796f9373044ea18a3deaf07e90 (patch) | |
| tree | 2d4724c02007aa13137e2467c1ba90fc57575cef | |
| parent | c217abcbd6fa7162e8a7d1bc96b83f2d20c84658 (diff) | |
| download | upstream-e26a7dcc11c9be796f9373044ea18a3deaf07e90.tar.gz upstream-e26a7dcc11c9be796f9373044ea18a3deaf07e90.tar.bz2 upstream-e26a7dcc11c9be796f9373044ea18a3deaf07e90.zip | |
kernel: in kernel 3.6.8 and later tg3 depends on hwmon.ko
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34652 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/modules/netdevices.mk | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm | 1 |
2 files changed, 2 insertions, 1 deletions
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 || { |