diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-01-17 17:53:56 +0000 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 19:28:50 -0500 |
| commit | 22d4d77183f0af8b3b643544a5ae64ec6105d88b (patch) | |
| tree | 147b99fdd2dcbaeeac0f23e67bfa0147d23748bc /drivers | |
| parent | 0570cc08194630bd78aef7c2c2b4f6a3f02c2bba (diff) | |
| download | linux-3.10-22d4d77183f0af8b3b643544a5ae64ec6105d88b.tar.gz linux-3.10-22d4d77183f0af8b3b643544a5ae64ec6105d88b.tar.bz2 linux-3.10-22d4d77183f0af8b3b643544a5ae64ec6105d88b.zip | |
[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 <alan@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/b44.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 7aa49b974dc..df9d6e80c4f 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); } |