diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/macintosh/therm_windtunnel.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/macintosh/therm_windtunnel.c')
| -rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 35233de460ad..3d0354e96a97 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
| @@ -459,7 +459,8 @@ therm_of_probe( struct of_device *dev, const struct of_device_id *match ) | |||
| 459 | static int | 459 | static int |
| 460 | therm_of_remove( struct of_device *dev ) | 460 | therm_of_remove( struct of_device *dev ) |
| 461 | { | 461 | { |
| 462 | return i2c_del_driver( &g4fan_driver ); | 462 | i2c_del_driver( &g4fan_driver ); |
| 463 | return 0; | ||
| 463 | } | 464 | } |
| 464 | 465 | ||
| 465 | static struct of_device_id therm_of_match[] = {{ | 466 | static struct of_device_id therm_of_match[] = {{ |