spi: Fix merge conflicts - Makefile