diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 15:25:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-03 15:25:14 -0700 |
| commit | 225ff868e1eeddcda06e06854e6292b1f8bb2edb (patch) | |
| tree | c062683b3d795a60bcb06405e97b3f9e7e591281 /drivers/thermal/exynos_thermal.c | |
| parent | 209c510e3666333ad58d3080ff3ba573474a6b05 (diff) | |
| parent | 3ae53b1e13e1ca7928a3dd2d51ea5417b618560c (diff) | |
| download | blackbird-op-linux-225ff868e1eeddcda06e06854e6292b1f8bb2edb.tar.gz blackbird-op-linux-225ff868e1eeddcda06e06854e6292b1f8bb2edb.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management & ACPI update from Zhang Rui,
Ho humm. Normally these things go through Len. But it's just three
small fixes, I guess I can pull directly too.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
exynos4_tmu_driver_ids should be exynos_tmu_driver_ids.
ACPI video: Ignore errors after _DOD evaluation.
thermal: solve compilation errors in rcar_thermal
Diffstat (limited to 'drivers/thermal/exynos_thermal.c')
| -rw-r--r-- | drivers/thermal/exynos_thermal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c index fd03e8581afc..6dd29e4ce36b 100644 --- a/drivers/thermal/exynos_thermal.c +++ b/drivers/thermal/exynos_thermal.c @@ -815,7 +815,7 @@ static struct platform_device_id exynos_tmu_driver_ids[] = { }, { }, }; -MODULE_DEVICE_TABLE(platform, exynos4_tmu_driver_ids); +MODULE_DEVICE_TABLE(platform, exynos_tmu_driver_ids); static inline struct exynos_tmu_platform_data *exynos_get_driver_data( struct platform_device *pdev) |
