Merge branch 'bugzilla-13577-video' into release

[sfrench/cifs-2.6.git] / drivers / macintosh / therm_windtunnel.c

diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 8b9364434aa0bbd21995c9b299c021075fabfb30..ba48fd76396eb9746d72e0db077b55dbf0f23ffa 100644 (file)
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -15,7 +15,7 @@
  *
  *     WARNING: This driver has only been testen on Apple's
  *     1.25 MHz Dual G4 (March 03). It is tuned for a CPU
- *     temperatur around 57 C.
+ *     temperature around 57 C.
  *
  *   Copyright (C) 2003, 2004 Samuel Rydh (samuel@ibrium.se)
  *
@@ -457,7 +457,7 @@ therm_of_remove( struct of_device *dev )
        return 0;
 }
 
-static struct of_device_id therm_of_match[] = {{
+static const struct of_device_id therm_of_match[] = {{
        .name           = "fan",
        .compatible     = "adm1030"
     }, {}