diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-14 12:08:53 -0500 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-14 12:08:53 -0500 |
commit | 1226e419377fb4b53d6e08c0a9fd5ecf90597cd6 (patch) | |
tree | 4dc413e65d771150bea650eeccaf45cf59ef3727 /arch/arm/mach-exynos4/mach-origen.c | |
parent | ec5237f097a75b7f4d19b87377ef1557431fb199 (diff) | |
parent | e82b9d821ecc1f857142a55b0fb38d0d5256fbaf (diff) |
Merge branch 'thermal_cpu_cooling' of git://git.linaro.org/people/amitdanielk/linux into linaro-3.1linux-linaro-3.1-2011.12-0
Conflicts:
drivers/thermal/Kconfig
drivers/thermal/Makefile
Diffstat (limited to 'arch/arm/mach-exynos4/mach-origen.c')
-rw-r--r-- | arch/arm/mach-exynos4/mach-origen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index b5f6f38557c..74180441852 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -83,6 +83,7 @@ static struct platform_device *origen_devices[] __initdata = { &s3c_device_hsmmc2, &s3c_device_rtc, &s3c_device_wdt, + &exynos4_device_tmu, }; static void __init origen_map_io(void) |