diff --git a/[refs] b/[refs]
index 38e220c6ba2f..56cc9ccbe797 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cbc7ca987fb3f293203dc14a6c53b91b7c978a5
+refs/heads/master: d560040f7d6fbe0a2990b8f6edca1815e19e72f5
diff --git a/trunk/include/linux/spi/spi_gpio.h b/trunk/include/linux/spi/spi_gpio.h
index 369b3d7d5b95..1634ce31c06d 100644
--- a/trunk/include/linux/spi/spi_gpio.h
+++ b/trunk/include/linux/spi/spi_gpio.h
@@ -62,8 +62,8 @@
  */
 struct spi_gpio_platform_data {
 	unsigned	sck;
-	unsigned	mosi;
-	unsigned	miso;
+	unsigned long	mosi;
+	unsigned long	miso;
 
 	u16		num_chipselect;
 };