diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /drivers/thermal/thermal.c | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/thermal/thermal.c')
| -rw-r--r-- | drivers/thermal/thermal.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal.c index 8b86e53ccf7a..7f79bbf652d7 100644 --- a/drivers/thermal/thermal.c +++ b/drivers/thermal/thermal.c | |||
| @@ -196,6 +196,10 @@ static struct device_attribute trip_point_attrs[] = { | |||
| 196 | __ATTR(trip_point_8_temp, 0444, trip_point_temp_show, NULL), | 196 | __ATTR(trip_point_8_temp, 0444, trip_point_temp_show, NULL), |
| 197 | __ATTR(trip_point_9_type, 0444, trip_point_type_show, NULL), | 197 | __ATTR(trip_point_9_type, 0444, trip_point_type_show, NULL), |
| 198 | __ATTR(trip_point_9_temp, 0444, trip_point_temp_show, NULL), | 198 | __ATTR(trip_point_9_temp, 0444, trip_point_temp_show, NULL), |
| 199 | __ATTR(trip_point_10_type, 0444, trip_point_type_show, NULL), | ||
| 200 | __ATTR(trip_point_10_temp, 0444, trip_point_temp_show, NULL), | ||
| 201 | __ATTR(trip_point_11_type, 0444, trip_point_type_show, NULL), | ||
| 202 | __ATTR(trip_point_11_temp, 0444, trip_point_temp_show, NULL), | ||
| 199 | }; | 203 | }; |
| 200 | 204 | ||
| 201 | #define TRIP_POINT_ATTR_ADD(_dev, _index, result) \ | 205 | #define TRIP_POINT_ATTR_ADD(_dev, _index, result) \ |