From 6e86f442864f084e2a03162f67d2b9e8a6a5b714 Mon Sep 17 00:00:00 2001
From: Emil Tantilov <emil.s.tantilov@intel.com>
Date: Wed, 16 May 2012 07:06:38 +0000
Subject: [PATCH] --- yaml --- r: 314271 b: refs/heads/master c:
 6cbc52ef10ba3c7fbd8954270c025ffbf643ab05 h: refs/heads/master i:   314269:
 f26d9ae491c0c6beb09d2cbdae41d3f852cc03ad   314267:
 2d7d0665d5b31b27395549266b417f2456cd4577   314263:
 679a07be79f1f7424f481aea318a0899f6f2c205   314255:
 b1f269900049ccc7656e14f700889c45e4d831d6   314239:
 af1c118ad6b8cf7270817733586d377fa325c624 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/net/ethernet/intel/ixgbe/Makefile      | 4 ++--
 trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a1b4ec581a0c..943e0ad36c4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f8a91ad9aafbc7c70097a16404fa89aa41c8deb
+refs/heads/master: 6cbc52ef10ba3c7fbd8954270c025ffbf643ab05
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/Makefile b/trunk/drivers/net/ethernet/intel/ixgbe/Makefile
index 0bdf06bc5c49..5fd5d04c26c9 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbe/Makefile
+++ b/trunk/drivers/net/ethernet/intel/ixgbe/Makefile
@@ -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
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
index 1d80b1cefa6a..2334fce47018 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
+++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c
@@ -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 @@ int ixgbe_sysfs_init(struct ixgbe_adapter *adapter)
 exit:
 	return rc;
 }
-#endif /* CONFIG_IXGBE_HWMON */