diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 19:46:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 19:46:46 -0800 |
| commit | d1138cf035ad5a8dc0796b213bd078a2fb92eb7c (patch) | |
| tree | 72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 /drivers/net/b44.c | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
| parent | 77783a78ded96a56e3a1a0c03bbe87c56896fe6e (diff) | |
| download | kernel_samsung_smdk4412-d1138cf035ad5a8dc0796b213bd078a2fb92eb7c.tar.gz kernel_samsung_smdk4412-d1138cf035ad5a8dc0796b213bd078a2fb92eb7c.tar.bz2 kernel_samsung_smdk4412-d1138cf035ad5a8dc0796b213bd078a2fb92eb7c.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/b44.c')
| -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); } |