4be2de46fb
We could blugeon these more into the scheme I guess, but does it make sense to do so? Also remove all remain vestiges of old scheme. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>