diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-28 12:13:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-28 12:13:13 -0700 |
| commit | b4d32648c190711177a664af7d51149a8950555e (patch) | |
| tree | 122bebbb0a1a150eee3e13a0f1689f1e8155f933 /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (diff) | |
| parent | hwmon (coretemp): Fix build breakage if SMP is undefined (diff) | |
| download | linux-dev-b4d32648c190711177a664af7d51149a8950555e.tar.xz linux-dev-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
Diffstat (limited to 'drivers')
| -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 @@ #include <linux/pci.h> #include <asm/msr.h> #include <asm/processor.h> +#include <asm/smp.h> #define DRVNAME "coretemp" |