diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-28 15:13:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-28 15:13:13 -0400 |
| commit | b4d32648c190711177a664af7d51149a8950555e (patch) | |
| tree | 122bebbb0a1a150eee3e13a0f1689f1e8155f933 | |
| parent | 0d70397bc72f2122f9702093cce3039ec3ae7575 (diff) | |
| parent | fff2017354a3a9906862aabbf2a1cae5b4330e40 (diff) | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index baa842a80b4b..a23b17a78ace 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
| 37 | #include <asm/msr.h> | 37 | #include <asm/msr.h> |
| 38 | #include <asm/processor.h> | 38 | #include <asm/processor.h> |
| 39 | #include <asm/smp.h> | ||
| 39 | 40 | ||
| 40 | #define DRVNAME "coretemp" | 41 | #define DRVNAME "coretemp" |
| 41 | 42 | ||