Fix for Live OC

Conflicts:
	drivers/misc/live_oc.c