From f30932eba1abf16cf38549f10929f998a720e35e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 25 Oct 2012 20:42:10 +0200 Subject: [PATCH] --- yaml --- r: 335951 b: refs/heads/master c: f65e384bec59ef35dfa77455181af2ecf7a7ef44 h: refs/heads/master i: 335949: 71884b76a87260664fdc1ae2216af70e74ae13fb 335947: 2a2b74b88b940662617063a31fea1547ebdfa834 335943: ba48b164c65b600ee69b7ab61adbc9f67505e644 335935: 773baa5e005f9c8f4834d9b4a54e0d8c962c5a3d v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dss.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ef570456d07f..5948213c5a4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea29c4ea2b04462e92f409cd852dfe0d6d04f0fc +refs/heads/master: f65e384bec59ef35dfa77455181af2ecf7a7ef44 diff --git a/trunk/drivers/video/omap2/dss/dss.c b/trunk/drivers/video/omap2/dss/dss.c index 2ab1c3e96553..0bb7406bdbb8 100644 --- a/trunk/drivers/video/omap2/dss/dss.c +++ b/trunk/drivers/video/omap2/dss/dss.c @@ -805,10 +805,10 @@ static int __init dss_init_features(struct device *dev) if (cpu_is_omap24xx()) src = &omap24xx_dss_feats; - else if (cpu_is_omap34xx()) - src = &omap34xx_dss_feats; else if (cpu_is_omap3630()) src = &omap3630_dss_feats; + else if (cpu_is_omap34xx()) + src = &omap34xx_dss_feats; else if (cpu_is_omap44xx()) src = &omap44xx_dss_feats; else if (soc_is_omap54xx())