diff --git a/[refs] b/[refs]
index 3321693beafd..1336bbddbfa3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b40ff4d729f4a7a9f832c67aa5de0dfa8ad45c0
+refs/heads/master: 14fd9b3f8a0a36e706d144efcd579805a99de594
diff --git a/trunk/Documentation/spi/spi-summary b/trunk/Documentation/spi/spi-summary
index 81b6230d3d22..ecc7c9eb9f29 100644
--- a/trunk/Documentation/spi/spi-summary
+++ b/trunk/Documentation/spi/spi-summary
@@ -284,7 +284,6 @@ SPI protocol drivers somewhat resemble platform device drivers:
 	static struct spi_driver CHIP_driver = {
 		.driver = {
 			.name		= "CHIP",
-			.bus		= &spi_bus_type,
 			.owner		= THIS_MODULE,
 		},