Merge drm/drm-next into drm-intel-next

[linux.git] / drivers / fpga / machxo2-spi.c

diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/machxo2-spi.c
index 114a64d2b7a4d68f81b50f73f9c38446a370d3d5..1afb41aa20d7151ff82ceb05d656e244b83b2079 100644 (file)
--- a/drivers/fpga/machxo2-spi.c
+++ b/drivers/fpga/machxo2-spi.c
@@ -374,11 +374,13 @@ static int machxo2_spi_probe(struct spi_device *spi)
        return devm_fpga_mgr_register(dev, mgr);
 }
 
+#ifdef CONFIG_OF
 static const struct of_device_id of_match[] = {
        { .compatible = "lattice,machxo2-slave-spi", },
        {}
 };
 MODULE_DEVICE_TABLE(of, of_match);
+#endif
 
 static const struct spi_device_id lattice_ids[] = {
        { "machxo2-slave-spi", 0 },