From 0355e2ad0f46a607516985ab67dc9da5cda1713e Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Wed, 12 Dec 2012 15:54:24 +0530 Subject: [PATCH] --- yaml --- r: 359759 b: refs/heads/master c: caa5cbd5a18a72bb6f5a5211ddeade71fdb2282d h: refs/heads/master i: 359757: c753075f1d8c57580e968616ad97b08c134978ee 359755: d11c068207e3bdef0af1c36e2e9f0c04935edbbc 359751: 03cc3716140e9694c1224dfe773f69902396c9e9 359743: feda94258ab8682e3ee952551cb07f507ac295c5 v: v3 --- [refs] | 2 +- trunk/drivers/thermal/exynos_thermal.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dcec22bd6db3..bd58c20ca13b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03b79bda8d061d80a6106e257c072a2754141bab +refs/heads/master: caa5cbd5a18a72bb6f5a5211ddeade71fdb2282d diff --git a/trunk/drivers/thermal/exynos_thermal.c b/trunk/drivers/thermal/exynos_thermal.c index e2ef8a3531ac..327102a4596a 100644 --- a/trunk/drivers/thermal/exynos_thermal.c +++ b/trunk/drivers/thermal/exynos_thermal.c @@ -808,8 +808,6 @@ static const struct of_device_id exynos_tmu_match[] = { {}, }; MODULE_DEVICE_TABLE(of, exynos_tmu_match); -#else -#define exynos_tmu_match NULL #endif static struct platform_device_id exynos_tmu_driver_ids[] = { @@ -1085,7 +1083,7 @@ static struct platform_driver exynos_tmu_driver = { .name = "exynos-tmu", .owner = THIS_MODULE, .pm = EXYNOS_TMU_PM, - .of_match_table = exynos_tmu_match, + .of_match_table = of_match_ptr(exynos_tmu_match), }, .probe = exynos_tmu_probe, .remove = __devexit_p(exynos_tmu_remove),