diff --git a/[refs] b/[refs]
index 3f54c4e5b9bb..250403ebad5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13e9ab11430c4bdc4b6bb97e3d3821ebdc043712
+refs/heads/master: 31b760202a0911384fa07796df9d1905e9e89a7f
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
index d30c938d0fbf..31ed1f49de00 100644
--- a/trunk/drivers/net/sfc/falcon.c
+++ b/trunk/drivers/net/sfc/falcon.c
@@ -1605,7 +1605,7 @@ void falcon_fini_interrupt(struct efx_nic *efx)
  **************************************************************************
  */
 
-#define FALCON_SPI_MAX_LEN sizeof(efx_oword_t)
+#define FALCON_SPI_MAX_LEN ((unsigned) sizeof(efx_oword_t))
 
 /* Wait for SPI command completion */
 static int falcon_spi_wait(struct efx_nic *efx)