Adapt missing changes from AOSP-S4-KK

	deleted:    drivers/net/tokenring/tms380tr.c
	deleted:    sound/soc/s6000/s6000-pcm.c