fix merge derp

Conflicts:
	include/video/omapdss.h