[PATCH net-next] qlcnic: Fix Kconfig dependency on HWMON

[PATCH net-next] qlcnic: Fix Kconfig dependency on HWMON

[Harish Patil]

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>
---
 drivers/net/ethernet/qlogic/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
index b818432..d49cba1 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
-- 
1.8.1.4

Re: [PATCH net-next] qlcnic: Fix Kconfig dependency on HWMON

[David Miller]

From: Harish Patil <harish.patil@qlogic.com>
Date: Wed, 7 May 2014 02:06:15 -0400

> 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>

Applied, thanks for following up on this.