aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-28 12:13:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-28 12:13:13 -0700
commitb4d32648c190711177a664af7d51149a8950555e (patch)
tree122bebbb0a1a150eee3e13a0f1689f1e8155f933
parent0d70397bc72f2122f9702093cce3039ec3ae7575 (diff)
parentfff2017354a3a9906862aabbf2a1cae5b4330e40 (diff)
downloadmrst-s0i3-test-b4d32648c190711177a664af7d51149a8950555e.tar.gz
mrst-s0i3-test-b4d32648c190711177a664af7d51149a8950555e.tar.xz
mrst-s0i3-test-b4d32648c190711177a664af7d51149a8950555e.zip
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon (coretemp): Fix build breakage if SMP is undefined
-rw-r--r--drivers/hwmon/coretemp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index baa842a80b4..a23b17a78ac 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -36,6 +36,7 @@
#include <linux/pci.h>
#include <asm/msr.h>
#include <asm/processor.h>
+#include <asm/smp.h>
#define DRVNAME "coretemp"