projects/linux·commit b4d32648

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging

b4d32648 · Linus Torvalds <[email protected]> · 2010-09-28 12:13:13 -07:00

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon (coretemp): Fix build breakage if SMP is undefined
Commit
b4d32648c190711177a664af7d51149a8950555e
Parents
0d70397b · fff20173

Merge commit. Changes below are compared with the first parent: 0d70397b.

Changes

1 files changed · +1 −0

FileStatusAddDelContent
drivers/hwmon/coretemp.cmodified+1−0View file

drivers/hwmon/coretemp.c

View file
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index baa842a..a23b17a 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"