diff --git a/[refs] b/[refs]
index c88bbc33b0b7..1789aa772f82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0570cc08194630bd78aef7c2c2b4f6a3f02c2bba
+refs/heads/master: 22d4d77183f0af8b3b643544a5ae64ec6105d88b
diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c
index 7aa49b974dc5..df9d6e80c4f2 100644
--- a/trunk/drivers/net/b44.c
+++ b/trunk/drivers/net/b44.c
@@ -2136,7 +2136,7 @@ static int __init b44_init(void)
 
 	/* Setup paramaters for syncing RX/TX DMA descriptors */
 	dma_desc_align_mask = ~(dma_desc_align_size - 1);
-	dma_desc_sync_size = max(dma_desc_align_size, sizeof(struct dma_desc));
+	dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));
 
 	return pci_module_init(&b44_driver);
 }