diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
| commit | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (patch) | |
| tree | 17b51ff707fd1b3efec3a3ab872f0d7a7416aca5 /drivers/hwmon/gpio-fan.c | |
| parent | 9c32c63bb70b2fafc3b18bee29959c3bf245ceba (diff) | |
| parent | 8def5f51b012efb00e77ba2d04696cc0aadd0609 (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'drivers/hwmon/gpio-fan.c')
| -rw-r--r-- | drivers/hwmon/gpio-fan.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c index 89aa9fb743af..9ba38f318ffb 100644 --- a/drivers/hwmon/gpio-fan.c +++ b/drivers/hwmon/gpio-fan.c | |||
| @@ -539,18 +539,7 @@ static struct platform_driver gpio_fan_driver = { | |||
| 539 | }, | 539 | }, |
| 540 | }; | 540 | }; |
| 541 | 541 | ||
| 542 | static int __init gpio_fan_init(void) | 542 | module_platform_driver(gpio_fan_driver); |
| 543 | { | ||
| 544 | return platform_driver_register(&gpio_fan_driver); | ||
| 545 | } | ||
| 546 | |||
| 547 | static void __exit gpio_fan_exit(void) | ||
| 548 | { | ||
| 549 | platform_driver_unregister(&gpio_fan_driver); | ||
| 550 | } | ||
| 551 | |||
| 552 | module_init(gpio_fan_init); | ||
| 553 | module_exit(gpio_fan_exit); | ||
| 554 | 543 | ||
| 555 | MODULE_AUTHOR("Simon Guinot <sguinot@lacie.com>"); | 544 | MODULE_AUTHOR("Simon Guinot <sguinot@lacie.com>"); |
| 556 | MODULE_DESCRIPTION("GPIO FAN driver"); | 545 | MODULE_DESCRIPTION("GPIO FAN driver"); |