Re: [PATCH 0/2] OMAP: DSS2: Fix DSS core init fail path

Hi,

On Thu, 2010-05-06 at 13:59 +0200, Nikula Jani.1 (EXT-Nixu/Helsinki)
wrote:
> Hi -
> 
> These patches fix the broken DSS omap_dss_probe() fail path, reported by Kevin
> Hilman [1].
> 
> Kevin, could you please check this with your setup too? It would be much
> appreciated.
> 
> [1] http://www.mail-archive.com/[email protected]/msg27112.html

Jani, I just noticed that this conflicts with the following patch in my
for-next branch:

commit 36b33efe80eb07e3447107c2bdba3c674c10a41a
Author: Roger Quadros <[email protected]>
Date:   Wed Mar 17 13:35:19 2010 +0100

    OMAP: DSS2: Add Kconfig option for DPI display type
    
    This allows us to disable DPI on systems that do not have it
    
    Signed-off-by: Roger Quadros <[email protected]>
    Signed-off-by: Tomi Valkeinen <[email protected]>

Can you rebase the patches on top of my for-next branch?

 Tomi


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html