diff options
author | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
commit | 56429e9b3be567a173bd05f5594faf8522c34d3a (patch) | |
tree | d218d430ed992cdfa42da084bf36e5aa3c2ecb26 /drivers/thermal/int340x_thermal/Makefile | |
parent | nfsd: convert nfs4_file searches to use RCU (diff) | |
parent | SUNRPC: Fix locking around callback channel reply receive (diff) | |
download | linux-56429e9b3be567a173bd05f5594faf8522c34d3a.tar.xz linux-56429e9b3be567a173bd05f5594faf8522c34d3a.zip |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.
Diffstat (limited to 'drivers/thermal/int340x_thermal/Makefile')
-rw-r--r-- | drivers/thermal/int340x_thermal/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/thermal/int340x_thermal/Makefile b/drivers/thermal/int340x_thermal/Makefile new file mode 100644 index 000000000000..ffe40bffaf1a --- /dev/null +++ b/drivers/thermal/int340x_thermal/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_INT340X_THERMAL) += int3400_thermal.o +obj-$(CONFIG_INT340X_THERMAL) += int3402_thermal.o +obj-$(CONFIG_INT340X_THERMAL) += int3403_thermal.o +obj-$(CONFIG_ACPI_THERMAL_REL) += acpi_thermal_rel.o |