From 89010e12ad31219b4cfb71c79ccaeb51c69ce049 Mon Sep 17 00:00:00 2001
From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Tue, 15 Apr 2008 14:34:47 -0700
Subject: [PATCH] --- yaml --- r: 88356 b: refs/heads/master c:
 5f1a3f2ac4ddf966cd0555dc445c6df65709c580 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/thermal/thermal.c | 4 ++++
 trunk/include/linux/thermal.h   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d3ef1cd3a462..ae64cfedfe39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0a37e008750ead1751b7d5e89d220a260a46147
+refs/heads/master: 5f1a3f2ac4ddf966cd0555dc445c6df65709c580
diff --git a/trunk/drivers/thermal/thermal.c b/trunk/drivers/thermal/thermal.c
index 8b86e53ccf7a..7f79bbf652d7 100644
--- a/trunk/drivers/thermal/thermal.c
+++ b/trunk/drivers/thermal/thermal.c
@@ -196,6 +196,10 @@ static struct device_attribute trip_point_attrs[] = {
 	__ATTR(trip_point_8_temp, 0444, trip_point_temp_show, NULL),
 	__ATTR(trip_point_9_type, 0444, trip_point_type_show, NULL),
 	__ATTR(trip_point_9_temp, 0444, trip_point_temp_show, NULL),
+	__ATTR(trip_point_10_type, 0444, trip_point_type_show, NULL),
+	__ATTR(trip_point_10_temp, 0444, trip_point_temp_show, NULL),
+	__ATTR(trip_point_11_type, 0444, trip_point_type_show, NULL),
+	__ATTR(trip_point_11_temp, 0444, trip_point_temp_show, NULL),
 };
 
 #define TRIP_POINT_ATTR_ADD(_dev, _index, result)     \
diff --git a/trunk/include/linux/thermal.h b/trunk/include/linux/thermal.h
index 818ca1cf0b6d..90c1c191ea69 100644
--- a/trunk/include/linux/thermal.h
+++ b/trunk/include/linux/thermal.h
@@ -50,7 +50,7 @@ struct thermal_cooling_device_ops {
 };
 
 #define THERMAL_TRIPS_NONE -1
-#define THERMAL_MAX_TRIPS 10
+#define THERMAL_MAX_TRIPS 12
 #define THERMAL_NAME_LENGTH 20
 struct thermal_cooling_device {
 	int id;