From 22d4d77183f0af8b3b643544a5ae64ec6105d88b Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 17 Jan 2006 17:53:56 +0000 Subject: [PATCH] Fix warning with b44.c on 64bit boxes sizeof() return is not an int, so use max_t to get the types right. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik --- drivers/net/b44.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net') diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 7aa49b974dc5..df9d6e80c4f2 100644 --- 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); } -- cgit v1.2.3