diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 10:35:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 10:35:30 +0200 |
| commit | 5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (patch) | |
| tree | a9ec5019e2b666a19874fc344ffb0dd5da6bce94 /drivers/net/r6040.c | |
| parent | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| download | op-kernel-dev-5ea472a77f8e4811ceee3f44a9deda6ad6e8b789.zip op-kernel-dev-5ea472a77f8e4811ceee3f44a9deda6ad6e8b789.tar.gz | |
Merge commit 'v2.6.30-rc1' into perfcounters/core
Conflicts:
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
include/linux/init_task.h
Merge reason: the conflicts are non-trivial: PowerPC placement
of sys_perf_counter_open has to be mixed with the
new preadv/pwrite syscalls.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 0a37f99..5e8540b 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -1085,13 +1085,13 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, goto err_out; /* this should always be supported */ - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (err) { printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" "not supported by the card\n"); goto err_out; } - err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); if (err) { printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" "not supported by the card\n"); |
