diff --git a/[refs] b/[refs]
index 450f732552ba..4161c089c2e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd4a319bc933ae93e68935b21924a9ca4ba2d060
+refs/heads/master: 7cb943615aabbd72624f77f0a84b8c5d627cf846
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 689eaf7485af..b8335a1f82ef 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -805,7 +805,7 @@ static int spi_master_initialize_queue(struct spi_master *master)
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_OF) && !defined(CONFIG_SPARC)
+#if defined(CONFIG_OF)
 /**
  * of_register_spi_devices() - Register child devices onto the SPI bus
  * @master:	Pointer to spi_master device