diff --git a/[refs] b/[refs]
index 282db0fe2bad..6430b07d3faa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8901e1b98e1dad75c4567d03dd00a59bd6c450e8
+refs/heads/master: 708a7e438806c02add92a585b0a6b4b2ae50159b
diff --git a/trunk/drivers/spi/spi_nuc900.c b/trunk/drivers/spi/spi_nuc900.c
index d5be18b3078c..3cd15f690f16 100644
--- a/trunk/drivers/spi/spi_nuc900.c
+++ b/trunk/drivers/spi/spi_nuc900.c
@@ -463,7 +463,7 @@ static int __devexit nuc900_spi_remove(struct platform_device *dev)
 
 	platform_set_drvdata(dev, NULL);
 
-	spi_unregister_master(hw->master);
+	spi_bitbang_stop(&hw->bitbang);
 
 	clk_disable(hw->clk);
 	clk_put(hw->clk);