Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x...

[linux-2.6-microblaze.git] / drivers / spi / spi-tegra114.c

diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 22905b5..6be661e 100644 (file)
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -23,7 +23,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/err.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
@@ -1043,7 +1042,6 @@ static int tegra_spi_probe(struct platform_device *pdev)
        master->setup = tegra_spi_setup;
        master->transfer_one_message = tegra_spi_transfer_one_message;
        master->num_chipselect = MAX_CHIP_SELECT;
-       master->bus_num = -1;
        master->auto_runtime_pm = true;
 
        tspi->master = master;