[flashrom] [x60s] flashrom compilation failing upon patching

[oneofthem]

Hey, I applied the patch here so I can use flashrom to flash my x60s
http://patchwork.coreboot.org/patch/3621/

But when I run make it gives me this error

flashchips.c:7518:14: error: ‘CHIP_BUSTYPE_SPI’ undeclared here (not in
a function)
   .bustype = CHIP_BUSTYPE_SPI,
              ^
flashchips.c:7524:13: error: ‘probe_spi_res’ undeclared here (not in a
function)
   .probe  = probe_spi_res,
             ^
make: *** [flashchips.o] Error 1