Clean up defconfig and add temp fix for fast_hotplug