Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / intel / Kconfig

diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 6c7863311a2d5908b91d6bfe83d9ead8b58748f5..05f7264c51f71899c308b19d616e2a8718de152a 100644 (file)
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -69,6 +69,7 @@ config E1000E
        tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
        depends on PCI && (!SPARC32 || BROKEN)
        select CRC32
+       select PTP_1588_CLOCK
        ---help---
          This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
          ethernet family of adapters. For PCI or PCI-X e1000 adapters,
@@ -89,6 +90,8 @@ config IGB
        tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support"
        depends on PCI
        select PTP_1588_CLOCK
+       select I2C
+       select I2C_ALGOBIT
        ---help---
          This driver supports Intel(R) 82575/82576 gigabit ethernet family of
          adapters.  For more information on how to identify your adapter, go
@@ -107,6 +110,17 @@ config IGB
          To compile this driver as a module, choose M here. The module
          will be called igb.
 
+config IGB_HWMON
+       bool "Intel(R) PCI-Express Gigabit adapters HWMON support"
+       default y
+       depends on IGB && HWMON && !(IGB=y && HWMON=m)
+       ---help---
+         Say Y if you want to expose thermal sensor data on Intel devices.
+
+         Some of our devices contain thermal sensors, both external and internal.
+         This data is available via the hwmon sysfs interface and exposes
+         the onboard sensors.
+
 config IGB_DCA
        bool "Direct Cache Access (DCA) Support"
        default y