Kconfig: Fixed merge error
Makefile: Fix derp from earlier commit