git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/asoc' into for-linus
[safe/jmp/linux-2.6]
/
drivers
/
macintosh
/
therm_windtunnel.c
diff --git
a/drivers/macintosh/therm_windtunnel.c
b/drivers/macintosh/therm_windtunnel.c
index
8b93644
..
0839770
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
*
* 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.
+ * temperatur
e
around 57 C.
*
* Copyright (C) 2003, 2004 Samuel Rydh (samuel@ibrium.se)
*
*
* Copyright (C) 2003, 2004 Samuel Rydh (samuel@ibrium.se)
*
@@
-34,7
+34,6
@@
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/i2c.h>
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/i2c.h>
-#include <linux/slab.h>
#include <linux/init.h>
#include <linux/kthread.h>
#include <linux/of_platform.h>
#include <linux/init.h>
#include <linux/kthread.h>
#include <linux/of_platform.h>
@@
-457,7
+456,7
@@
therm_of_remove( struct of_device *dev )
return 0;
}
return 0;
}
-static struct of_device_id therm_of_match[] = {{
+static
const
struct of_device_id therm_of_match[] = {{
.name = "fan",
.compatible = "adm1030"
}, {}
.name = "fan",
.compatible = "adm1030"
}, {}
@@
-490,7
+489,7
@@
g4fan_init( void )
info = of_get_property(np, "thermal-info", NULL);
of_node_put(np);
info = of_get_property(np, "thermal-info", NULL);
of_node_put(np);
- if( !info || !machine_is_compatible("PowerMac3,6") )
+ if( !info || !
of_
machine_is_compatible("PowerMac3,6") )
return -ENODEV;
if( info->id != 3 ) {
return -ENODEV;
if( info->id != 3 ) {