diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 10:02:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 10:02:58 -0700 |
| commit | a5e11599da95fbe8425db0cfd01a581d7412d0c9 (patch) | |
| tree | 45fccb4b27a1068cec8dc8283260893b60ca46d2 /drivers/hwmon/Makefile | |
| parent | 0f477dd0851bdcee82923da66a7fc4a44cb1bc3d (diff) | |
| parent | a3159864f2978bf2ace9cc787d73d315c98bbf9a (diff) | |
Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, hwmon: Package Level Thermal/Power: pkgtemp documentation
x86, hwmon: Package Level Thermal/Power: power limit
x86, hwmon: Package Level Thermal/Power: thermal throttling handler
x86, hwmon: Package Level Thermal/Power: pkgtemp hwmon driver
Diffstat (limited to 'drivers/hwmon/Makefile')
| -rw-r--r-- | drivers/hwmon/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index c5057745b068..9103bd6ea73a 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_SENSORS_AMS) += ams/ obj-$(CONFIG_SENSORS_ASC7621) += asc7621.o obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o +obj-$(CONFIG_SENSORS_PKGTEMP) += pkgtemp.o obj-$(CONFIG_SENSORS_DME1737) += dme1737.o obj-$(CONFIG_SENSORS_DS1621) += ds1621.o obj-$(CONFIG_SENSORS_EMC1403) += emc1403.o |