diff options
| author | Harish Patil <harish.patil@qlogic.com> | 2014-05-07 08:06:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-07 23:23:25 +0200 |
| commit | f398a77177716137cceda2f00901f54413677869 (patch) | |
| tree | 7eedc81f43165bcd805d9565908e2c39f61eb7e8 /drivers/net/ethernet/qlogic/Kconfig | |
| parent | Merge branch 'micrel_ksz9031' (diff) | |
| download | linux-f398a77177716137cceda2f00901f54413677869.tar.xz linux-f398a77177716137cceda2f00901f54413677869.zip | |
qlcnic: Fix Kconfig dependency on HWMON
Commit 1f0f467b670e "qlcnic: Add hwmon interface to export board
temperature" introduced a randconfig build error in the case
when the hwmon framework is built as a module and the qlcnic
driver itself is built-in:
drivers/built-in.o: In function `qlcnic_register_hwmon_dev':
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c:1301:
undefined reference to `hwmon_device_register_with_groups'
drivers/built-in.o: In function `qlcnic_unregister_hwmon_dev':
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c:1309:
undefined reference to `hwmon_device_unregister'.
This changes the Kconfig logic to enforce that the qlcnic hwmon
support can only be enabled if it is possible to successfully
build it.
Signed-off-by: Harish Patil <harish.patil@qlogic.com>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/qlogic/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig index b8184323faae..d49cba129081 100644 --- a/drivers/net/ethernet/qlogic/Kconfig +++ b/drivers/net/ethernet/qlogic/Kconfig @@ -68,7 +68,7 @@ config QLCNIC_VXLAN config QLCNIC_HWMON bool "QLOGIC QLCNIC 82XX and 83XX family HWMON support" - depends on QLCNIC && HWMON + depends on QLCNIC && HWMON && !(QLCNIC=y && HWMON=m) default y ---help--- This configuration parameter can be used to read the |