mako hotplug control from franciscofranco

Conflicts:
	drivers/misc/Makefile