Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / spi / spi-xilinx.c

diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index a3b0b9944bf000c7b69afd868a1c8eed71308489..4d8efb16573d1a7c8690fee0464a0b34734030c4 100644 (file)
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -369,7 +369,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
                goto put_master;
        }
 
-       master->bus_num = pdev->dev.id;
+       master->bus_num = pdev->id;
        master->num_chipselect = num_cs;
        master->dev.of_node = pdev->dev.of_node;