Merge branch 'tracing/ftrace' into auto-ftrace-next

[linux-2.6] / drivers / thermal / Makefile

diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 02b64517be8fb38a8b1be77a448fc2e73941d46a..31108a01c22e21d659aa68609cda0436f123e448 100644 (file)
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -2,5 +2,4 @@
 # Makefile for sensor chip drivers.
 #
 
-thermal_sys-objs       += thermal.o
 obj-$(CONFIG_THERMAL)          += thermal_sys.o