omap: dss: fix omapdss.h merge derp.