diff --git a/[refs] b/[refs]
index 57e228c73954..5d246c898e06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e253d23003b54c88d0919d6088be74f00eec3c7
+refs/heads/master: e39ea8a2def1fcb203ed0183317124348962e351
diff --git a/trunk/drivers/spi/spi_s3c24xx_gpio.c b/trunk/drivers/spi/spi_s3c24xx_gpio.c
index cc1f647f579b..8bb2b4ee3e50 100644
--- a/trunk/drivers/spi/spi_s3c24xx_gpio.c
+++ b/trunk/drivers/spi/spi_s3c24xx_gpio.c
@@ -34,7 +34,7 @@ struct s3c2410_spigpio {
 
 static inline struct s3c2410_spigpio *spidev_to_sg(struct spi_device *spi)
 {
-	return spi->controller_data;
+	return spi_master_get_devdata(spi->master);
 }
 
 static inline void setsck(struct spi_device *dev, int on)