diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-15 08:21:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-15 08:21:30 +0100 |
| commit | 6a54aebf6978e9f296a4d3da3e40af425163c22e (patch) | |
| tree | 8217c7114db02d8b69c22fc44880749426949bc3 /drivers/hwmon/jz4740-hwmon.c | |
| parent | 067491b7313c41f49607fce782d29344d1472587 (diff) | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| download | blackbird-obmc-linux-6a54aebf6978e9f296a4d3da3e40af425163c22e.tar.gz blackbird-obmc-linux-6a54aebf6978e9f296a4d3da3e40af425163c22e.zip | |
Merge commit 'v3.2-rc5' into sched/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/hwmon/jz4740-hwmon.c')
| -rw-r--r-- | drivers/hwmon/jz4740-hwmon.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c index fea292d43407..7a48b1eb4233 100644 --- a/drivers/hwmon/jz4740-hwmon.c +++ b/drivers/hwmon/jz4740-hwmon.c @@ -212,17 +212,7 @@ struct platform_driver jz4740_hwmon_driver = { }, }; -static int __init jz4740_hwmon_init(void) -{ - return platform_driver_register(&jz4740_hwmon_driver); -} -module_init(jz4740_hwmon_init); - -static void __exit jz4740_hwmon_exit(void) -{ - platform_driver_unregister(&jz4740_hwmon_driver); -} -module_exit(jz4740_hwmon_exit); +module_platform_driver(jz4740_hwmon_driver); MODULE_DESCRIPTION("JZ4740 SoC HWMON driver"); MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>"); |
