Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index eca9d52ecf65..9eb82150666e 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -410,6 +410,12 @@ static int spi_gpio_probe(struct platform_device *pdev)
 
         bb = &spi_gpio->bitbang;
         bb->master = master;
+        /*
+         * There is some additional business, apart from driving the CS GPIO
+         * line, that we need to do on selection. This makes the local
+         * callback for chipselect always get called.
+         */
+        master->flags |= SPI_MASTER_GPIO_SS;
         bb->chipselect = spi_gpio_chipselect;
         bb->set_line_direction = spi_gpio_set_direction;