fix merge of Martin Sperl's SPI driver