diff --git a/[refs] b/[refs]
index 9c5f15c3b2a6..2cc3eb87f30c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99f1a43f436a6a92d15bddfeb65f3a920c8b88d3
+refs/heads/master: 1dcf57ceb461fe2ddeb622fe84d9918aadefe7ba
diff --git a/trunk/Documentation/spi/spidev_fdx.c b/trunk/Documentation/spi/spidev_fdx.c
index fc354f760384..36ec0774ca0b 100644
--- a/trunk/Documentation/spi/spidev_fdx.c
+++ b/trunk/Documentation/spi/spidev_fdx.c
@@ -58,10 +58,10 @@ static void do_msg(int fd, int len)
 		len = sizeof buf;
 
 	buf[0] = 0xaa;
-	xfer[0].tx_buf = (__u64) buf;
+	xfer[0].tx_buf = (unsigned long)buf;
 	xfer[0].len = 1;
 
-	xfer[1].rx_buf = (__u64) buf;
+	xfer[1].rx_buf = (unsigned long) buf;
 	xfer[1].len = len;
 
 	status = ioctl(fd, SPI_IOC_MESSAGE(2), xfer);