diff --git a/[refs] b/[refs]
index 543629fe1204..3ae73c6f21f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc98d13f5cce1b617305966c3e95f7b2e62aa820
+refs/heads/master: 067aa4815a9bc12a569d8a06afef50ba5773afbf
diff --git a/trunk/drivers/spi/spi-fsl-spi.c b/trunk/drivers/spi/spi-fsl-spi.c
index 5f748c0d96bd..6a62934ca74c 100644
--- a/trunk/drivers/spi/spi-fsl-spi.c
+++ b/trunk/drivers/spi/spi-fsl-spi.c
@@ -933,7 +933,7 @@ static struct spi_master * __devinit fsl_spi_probe(struct device *dev,
 
 static void fsl_spi_cs_control(struct spi_device *spi, bool on)
 {
-	struct device *dev = spi->dev.parent;
+	struct device *dev = spi->dev.parent->parent;
 	struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(dev->platform_data);
 	u16 cs = spi->chip_select;
 	int gpio = pinfo->gpios[cs];