ixgbe: do not compile ixgbe_sysfs.c when CONFIG_IXGBE_HWMON is not set
authorEmil Tantilov <emil.s.tantilov@intel.com>
Wed, 16 May 2012 07:06:38 +0000 (07:06 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 14 Jun 2012 10:12:41 +0000 (03:12 -0700)
ixgbe_sysfs.c is only needed when CONFIG_IXGBE_HWMON is configured in the
kernel.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Acked-by: Don Skidmore <Donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/Makefile
drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c

index 0bdf06bc5c4980c2e5a1a165686b85c57fdf5c0e..5fd5d04c26c9a850543d966655b6b32956293a3b 100644 (file)
@@ -34,11 +34,11 @@ obj-$(CONFIG_IXGBE) += ixgbe.o
 
 ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
               ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
-              ixgbe_mbx.o ixgbe_x540.o ixgbe_sysfs.o ixgbe_lib.o
+              ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o
 
 ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \
                               ixgbe_dcb_82599.o ixgbe_dcb_nl.o
 
 ixgbe-$(CONFIG_IXGBE_PTP) += ixgbe_ptp.o
-
+ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o
 ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o
index 1d80b1cefa6a8bd458f051332920e2d7b29675cf..2334fce47018ff1d48d29677e3e0e19db66a3dc1 100644 (file)
@@ -37,7 +37,6 @@
 #include <linux/netdevice.h>
 #include <linux/hwmon.h>
 
-#ifdef CONFIG_IXGBE_HWMON
 /* hwmon callback functions */
 static ssize_t ixgbe_hwmon_show_location(struct device *dev,
                                         struct device_attribute *attr,
@@ -241,5 +240,4 @@ err:
 exit:
        return rc;
 }
-#endif /* CONFIG_IXGBE_HWMON */