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

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

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index acc88b4d28693da4d59d315b350f0e717837e607..249077e5cc484ffbac1a8d320882faa56c08ff8f 100644 (file)
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -216,9 +216,6 @@ static __devinit int ath79_spi_probe(struct platform_device *pdev)
        if (pdata) {
                master->bus_num = pdata->bus_num;
                master->num_chipselect = pdata->num_chipselect;
-       } else {
-               master->bus_num = -1;
-               master->num_chipselect = 1;
        }
 
        sp->bitbang.master = spi_master_get(master);