Merge branch 'upstream'

git-mirror · Jan 18, 2006 · ef6f63a · ef6f63a
2 parents 03a49ee + 22d4d77
commit ef6f63a
Show file tree

Hide file tree

Showing 2 changed files with 137 additions and 84 deletions.
diff --git a/drivers/net/b44.c b/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);
 }