diff --git a/[refs] b/[refs]
index 676daab9167c..31646a950626 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d66d7ac2e09f26dbcd3bfbd8bb05e658de89719a
+refs/heads/master: 170d35a57cf2c87bbfdfe6ec0485f678bdb53737
diff --git a/trunk/drivers/ntb/ntb_hw.c b/trunk/drivers/ntb/ntb_hw.c
index 4c71b17f0166..7d087bbab190 100644
--- a/trunk/drivers/ntb/ntb_hw.c
+++ b/trunk/drivers/ntb/ntb_hw.c
@@ -236,20 +236,6 @@ void ntb_unregister_transport(struct ntb_device *ndev)
 	ndev->ntb_transport = NULL;
 }
 
-/**
- * ntb_get_max_spads() - get the total scratch regs usable
- * @ndev: pointer to ntb_device instance
- *
- * This function returns the max 32bit scratchpad registers usable by the
- * upper layer.
- *
- * RETURNS: total number of scratch pad registers available
- */
-int ntb_get_max_spads(struct ntb_device *ndev)
-{
-	return ndev->limits.max_spads;
-}
-
 /**
  * ntb_write_local_spad() - write to the secondary scratchpad register
  * @ndev: pointer to ntb_device instance
diff --git a/trunk/drivers/ntb/ntb_transport.c b/trunk/drivers/ntb/ntb_transport.c
index c0eca02eb6d0..903a72e7d112 100644
--- a/trunk/drivers/ntb/ntb_transport.c
+++ b/trunk/drivers/ntb/ntb_transport.c
@@ -212,7 +212,7 @@ static int ntb_client_remove(struct device *dev)
 	return 0;
 }
 
-struct bus_type ntb_bus_type = {
+static struct bus_type ntb_bus_type = {
 	.name = "ntb_bus",
 	.match = ntb_match_bus,
 	.probe = ntb_client_probe,