Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel...

[pandora-kernel.git] / drivers / spi / spi_nuc900.c

diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c
index d5be18b..3cd15f6 100644 (file)
--- a/drivers/spi/spi_nuc900.c
+++ b/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);