--- zzzz-none-000/linux-5.15.111/drivers/mtd/spi-nor/Makefile	2023-05-11 14:00:40.000000000 +0000
+++ puma7-atom-6670-761/linux-5.15.111/drivers/mtd/spi-nor/Makefile	2024-02-07 10:23:07.000000000 +0000
@@ -18,5 +18,7 @@
 spi-nor-objs			+= xilinx.o
 spi-nor-objs			+= xmc.o
 obj-$(CONFIG_MTD_SPI_NOR)	+= spi-nor.o
-
-obj-$(CONFIG_MTD_SPI_NOR)	+= controllers/
+# Use our old implementation of intel-spi driver instead of Vanilla's
+# obj-$(CONFIG_MTD_SPI_NOR)	+= controllers/
+obj-$(CONFIG_SPI_INTEL_SPI)    += intel-spi.o
+obj-$(CONFIG_SPI_INTEL_SPI_PLATFORM)   += intel-spi-platform.o