projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] ppc64: AC Power handling broken for desktops
[powerpc.git]
/
drivers
/
macintosh
/
therm_windtunnel.c
diff --git
a/drivers/macintosh/therm_windtunnel.c
b/drivers/macintosh/therm_windtunnel.c
index
61400f0
..
6aaa1df
100644
(file)
--- a/
drivers/macintosh/therm_windtunnel.c
+++ b/
drivers/macintosh/therm_windtunnel.c
@@
-43,6
+43,7
@@
#include <asm/system.h>
#include <asm/sections.h>
#include <asm/of_device.h>
#include <asm/system.h>
#include <asm/sections.h>
#include <asm/of_device.h>
+#include <asm/macio.h>
#define LOG_TEMP 0 /* continously log temperature */
#define LOG_TEMP 0 /* continously log temperature */
@@
-450,7
+451,7
@@
do_probe( struct i2c_adapter *adapter, int addr, int kind )
/************************************************************************/
static int
/************************************************************************/
static int
-therm_of_probe( struct of_device *dev, const struct of_
match
*match )
+therm_of_probe( struct of_device *dev, const struct of_
device_id
*match )
{
return i2c_add_driver( &g4fan_driver );
}
{
return i2c_add_driver( &g4fan_driver );
}
@@
-461,9
+462,8
@@
therm_of_remove( struct of_device *dev )
return i2c_del_driver( &g4fan_driver );
}
return i2c_del_driver( &g4fan_driver );
}
-static struct of_
match
therm_of_match[] = {{
+static struct of_
device_id
therm_of_match[] = {{
.name = "fan",
.name = "fan",
- .type = OF_ANY_MATCH,
.compatible = "adm1030"
}, {}
};
.compatible = "adm1030"
}, {}
};
@@
-504,7
+504,7
@@
g4fan_init( void )
}
if( !(np=of_find_node_by_name(NULL, "fan")) )
return -ENODEV;
}
if( !(np=of_find_node_by_name(NULL, "fan")) )
return -ENODEV;
- x.of_dev = of_platform_device_create(
np, "temperature"
);
+ x.of_dev = of_platform_device_create(
np, "temperature", NULL
);
of_node_put( np );
if( !x.of_dev ) {
of_node_put( np );
if( !x.of_dev ) {