diff --git a/[refs] b/[refs]
index 5d246c898e06..07182b6dafe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e39ea8a2def1fcb203ed0183317124348962e351
+refs/heads/master: b93c35ff39d19f20c47c06c206986afefecc777a
diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/trunk/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
index 3fe8be9ca110..980a099e209c 100644
--- a/trunk/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
+++ b/trunk/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
@@ -18,6 +18,7 @@ struct s3c2410_spigpio_info {
 	unsigned long		 pin_mosi;
 	unsigned long		 pin_miso;
 
+	int			 num_chipselect;
 	int			 bus_num;
 
 	void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
diff --git a/trunk/drivers/spi/spi_s3c24xx_gpio.c b/trunk/drivers/spi/spi_s3c24xx_gpio.c
index 8bb2b4ee3e50..f2447a5476bb 100644
--- a/trunk/drivers/spi/spi_s3c24xx_gpio.c
+++ b/trunk/drivers/spi/spi_s3c24xx_gpio.c
@@ -118,6 +118,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
 	/* setup spi bitbang adaptor */
 	sp->bitbang.master = spi_master_get(master);
 	sp->bitbang.master->bus_num = info->bus_num;
+	sp->bitbang.master->num_chipselect = info->num_chipselect;
 	sp->bitbang.chipselect = s3c2410_spigpio_chipselect;
 
 	sp->bitbang.txrx_word[SPI_MODE_0] = s3c2410_spigpio_txrx_mode0;