warning cleanup

Conflicts:
	include/linux/disp_debug.h