On Wed, 2011-03-09 at 05:45 -0600, K, Mythri P wrote: > Adding HDMI support on OMAP4. > > HDMI is a driver that is similar to the VENC or the DSI driver to support > HDMI/DVI sink device. > > The current design adheres to the DSS2 architecture. > > It is split into the HDMI DSS driver and HDMI panel driver. This doesn't apply to my tree. Are you sure it's based on DSS master branch? Applying: OMAP4 : DSS2 : Add display type HDMI to DSS2 Applying: OMAP4 : DSS2 : HDMI: Select between HDMI VENC clock source. Applying: OMAP4 : DSS2 : HDMI: HDMI dispc gamma table disable. Applying: OMAP4 : DSS2 : HDMI: HDMI driver header file addition Applying: OMAP4 : DSS2 : HDMI: HDMI driver addition in the DSS fatal: sha1 information is lacking or useless (drivers/video/omap2/dss/dss.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0005 OMAP4 : DSS2 : HDMI: HDMI driver addition in the DSS When you have resolved this problem run "git am -3 --resolved". If you would prefer to skip this patch, instead run "git am -3 --skip". To restore the original branch and stop patching run "git am -3 --abort". Tomi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
