diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-20 09:43:53 -0500 |
| commit | 1fbe6f625f69e48c4001051dc1431afc704acfaa (patch) | |
| tree | 826b741201a2e09a627ed350c6ff36935f5cff79 /drivers/hwmon/twl4030-madc-hwmon.c | |
| parent | 0cecdd818cd79d092e36e70dfe3a71f2878d6b96 (diff) | |
| parent | 384703b8e6cd4c8ef08512e596024e028c91c339 (diff) | |
Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next
Merge in the upstream tree to bring in the mainline fixes.
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
drivers/gpu/drm/nouveau/nouveau_sgdma.c
Diffstat (limited to 'drivers/hwmon/twl4030-madc-hwmon.c')
| -rw-r--r-- | drivers/hwmon/twl4030-madc-hwmon.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c index 57240740b161..0018c7dd0097 100644 --- a/drivers/hwmon/twl4030-madc-hwmon.c +++ b/drivers/hwmon/twl4030-madc-hwmon.c | |||
| @@ -136,19 +136,7 @@ static struct platform_driver twl4030_madc_hwmon_driver = { | |||
| 136 | }, | 136 | }, |
| 137 | }; | 137 | }; |
| 138 | 138 | ||
| 139 | static int __init twl4030_madc_hwmon_init(void) | 139 | module_platform_driver(twl4030_madc_hwmon_driver); |
| 140 | { | ||
| 141 | return platform_driver_register(&twl4030_madc_hwmon_driver); | ||
| 142 | } | ||
| 143 | |||
| 144 | module_init(twl4030_madc_hwmon_init); | ||
| 145 | |||
| 146 | static void __exit twl4030_madc_hwmon_exit(void) | ||
| 147 | { | ||
| 148 | platform_driver_unregister(&twl4030_madc_hwmon_driver); | ||
| 149 | } | ||
| 150 | |||
| 151 | module_exit(twl4030_madc_hwmon_exit); | ||
| 152 | 140 | ||
| 153 | MODULE_DESCRIPTION("TWL4030 ADC Hwmon driver"); | 141 | MODULE_DESCRIPTION("TWL4030 ADC Hwmon driver"); |
| 154 | MODULE_LICENSE("GPL"); | 142 | MODULE_LICENSE("GPL"); |