diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /drivers/macintosh/therm_windtunnel.c | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'drivers/macintosh/therm_windtunnel.c')
| -rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 3fbe41b0ac07..ba48fd76396e 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
| @@ -457,7 +457,7 @@ therm_of_remove( struct of_device *dev ) | |||
| 457 | return 0; | 457 | return 0; |
| 458 | } | 458 | } |
| 459 | 459 | ||
| 460 | static struct of_device_id therm_of_match[] = {{ | 460 | static const struct of_device_id therm_of_match[] = {{ |
| 461 | .name = "fan", | 461 | .name = "fan", |
| 462 | .compatible = "adm1030" | 462 | .compatible = "adm1030" |
| 463 | }, {} | 463 | }, {} |