From b339a2b6d596c8cf951667f66f1e8a00c6bb89ef Mon Sep 17 00:00:00 2001 From: Shaik Ameer Basha Date: Tue, 16 Oct 2012 10:43:44 -0300 Subject: [PATCH] --- yaml --- r: 343779 b: refs/heads/master c: 840354381127fe1097a332bb3e56a1a479cb47f0 h: refs/heads/master i: 343777: 0c1d6900534fd5906a38d6fcc4a59b7d309cdd43 343775: 9ceb257b76bc1b8be21f864108c2c2774cb785a5 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/exynos-gsc/gsc-core.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38248036af20..4a80e8976072 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57fcfb6f935889c2086681d1bbc4ba0d47aeb768 +refs/heads/master: 840354381127fe1097a332bb3e56a1a479cb47f0 diff --git a/trunk/drivers/media/platform/exynos-gsc/gsc-core.c b/trunk/drivers/media/platform/exynos-gsc/gsc-core.c index 949c93ceaab1..cc7b218d047c 100644 --- a/trunk/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/trunk/drivers/media/platform/exynos-gsc/gsc-core.c @@ -965,8 +965,10 @@ static struct platform_device_id gsc_driver_ids[] = { MODULE_DEVICE_TABLE(platform, gsc_driver_ids); static const struct of_device_id exynos_gsc_match[] = { - { .compatible = "samsung,exynos5250-gsc", - .data = &gsc_v_100_drvdata, }, + { + .compatible = "samsung,exynos5-gsc", + .data = &gsc_v_100_drvdata, + }, {}, }; MODULE_DEVICE_TABLE(of, exynos_gsc_match);